Removed Makefile.in's and libtool/automake files that are

[yaz-moved-to-github.git] / odr / ber_int.c

diff --git a/odr/ber_int.c b/odr/ber_int.c
index 88b647f..6774a69 100644 (file)
--- a/odr/ber_int.c
+++ b/odr/ber_int.c
@@ -1,10 +1,39 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_int.c,v $
- * Revision 1.10  1995-09-29 17:01:50  quinn
+ * Revision 1.19  2000-10-06 12:46:27  adam
+ * Including sys/types.h and netinet/in.h instead on arpa/inet.h on Unix.
+ *
+ * Revision 1.18  2000/02/29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.17  2000/02/28 11:20:06  adam
+ * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
+ *
+ * Revision 1.16  2000/01/31 13:15:21  adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.15  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.14  1999/05/26 07:49:35  adam
+ * C++ compilation.
+ *
+ * Revision 1.13  1999/01/08 11:23:22  adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.12  1996/07/06 19:58:33  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.11  1995/09/29  17:12:16  quinn
+ * Smallish
+ *
+ * Revision 1.10  1995/09/29  17:01:50  quinn
  * More Windows work
  *
  * Revision 1.9  1995/09/28  10:12:39  quinn
@@ -36,25 +65,25 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include <string.h>
 
-#include <sys/types.h>
-
-#ifdef WINDOWS
+#ifdef WIN32
 #include <winsock.h>
 #else
-#include <netinet/in.h>  /* for htons... */
+#include <sys/types.h>
+#include <netinet/in.h>
 #endif
 
-#include <string.h>
-
-#include <odr.h>
-#include <prt.h>
+#include <yaz/odr.h>
 
-static int MDF ber_encinteger(ODR o, int val);
-static int MDF ber_decinteger(unsigned char *buf, int *val);
+static int ber_encinteger(ODR o, int val);
+static int ber_decinteger(const unsigned char *buf, int *val);
 
-int MDF ber_integer(ODR o, int *val)
+int ber_integer(ODR o, int *val)
 {
     int res;
 
@@ -67,7 +96,6 @@ int MDF ber_integer(ODR o, int *val)
                 return 0;
             }
             o->bp += res;
-            o->left -= res;
             return 1;
         case ODR_ENCODE:
             if ((res = ber_encinteger(o, *val)) < 0)
@@ -81,7 +109,7 @@ int MDF ber_integer(ODR o, int *val)
 /*
  * Returns: number of bytes written or -1 for error (out of bounds).
  */
-int MDF ber_encinteger(ODR o, int val)
+int ber_encinteger(ODR o, int val)
 {
     int lenpos;
     int a, len;
@@ -91,7 +119,7 @@ int MDF ber_encinteger(ODR o, int val)
     if (odr_putc(o, 0) < 0)  /* dummy */
         return -1;
     tmp.i = htonl(val);   /* ensure that that we're big-endian */
-    for (a = 0; a < sizeof(int) - 1; a++)  /* skip superfluous octets */
+    for (a = 0; a < (int) sizeof(int) - 1; a++)  /* skip superfluous octets */
         if (!((tmp.c[a] == 0 && !(tmp.c[a+1] & 0X80)) ||
             (tmp.c[a] == 0XFF && (tmp.c[a+1] & 0X80))))
             break;
@@ -111,15 +139,16 @@ int MDF ber_encinteger(ODR o, int val)
 /*
  * Returns: Number of bytes read or 0 if no match, -1 if error.
  */
-int MDF ber_decinteger(unsigned char *buf, int *val)
+int ber_decinteger(const unsigned char *buf, int *val)
 {
-    unsigned char *b = buf, fill;
+    const unsigned char *b = buf;
+    unsigned char fill;
     int res, len, remains;
     union { int i; unsigned char c[sizeof(int)]; } tmp;
 
     if ((res = ber_declen(b, &len)) < 0)
         return -1;
-    if (len > sizeof(int))    /* let's be reasonable, here */
+    if (len > (int) sizeof(int))    /* let's be reasonable, here */
         return -1;
     b+= res;