projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Choose IPV6 over IPV4 addrany addresses (bug #2350).
[yaz-moved-to-github.git]
/
src
/
ber_int.c
diff --git
a/src/ber_int.c
b/src/ber_int.c
index
84e560b
..
5524096
100644
(file)
--- a/
src/ber_int.c
+++ b/
src/ber_int.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: ber_int.c,v 1.5 2005-06-25 15:46:03 adam Exp $
*/
/**
*/
/**
@@
-25,7
+23,8
@@
#ifdef WIN32
#include <winsock.h>
#ifdef WIN32
#include <winsock.h>
-#else
+#endif
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#include <netinet/in.h>
#endif
@@
-77,9
+76,6
@@
int ber_encinteger(ODR o, int val)
return -1;
if (odr_write(o, (unsigned char*) tmp.c + a, len) < 0)
return -1;
return -1;
if (odr_write(o, (unsigned char*) tmp.c + a, len) < 0)
return -1;
-#ifdef ODR_DEBUG
- fprintf(stderr, "[val=%d]", val);
-#endif
return 0;
}
return 0;
}
@@
-111,9
+107,6
@@
int ber_decinteger(const unsigned char *buf, int *val, int max)
*val = ntohl(tmp.i);
b += len;
*val = ntohl(tmp.i);
b += len;
-#ifdef ODR_DEBUG
- fprintf(stderr, "[val=%d]", *val);
-#endif
return b - buf;
}
/*
return b - buf;
}
/*