X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_int.c;h=40dbb0ce9853c20e09ac92af7d90c7d731dbb28a;hp=13e07cb93821048ccc3772fa18fd9661814c8cf7;hb=dca8928db421aa8750ac9ffead1a5c09a85f4f8b;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c

diff --git a/src/ber_int.c b/src/ber_int.c
index 13e07cb..40dbb0c 100644
--- a/src/ber_int.c
+++ b/src/ber_int.c
@@ -1,9 +1,9 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 
-/** 
+/**
  * \file ber_int.c
  * \brief Implements BER INTEGER encoding and decoding.
  *
@@ -24,28 +24,25 @@
 #ifdef WIN32
 #include <winsock.h>
 #endif
-#if HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
 
 #include "odr-priv.h"
 
-static int ber_encinteger(ODR o, int val);
-static int ber_decinteger(const unsigned char *buf, int *val, int max);
+static int ber_encinteger(ODR o, Odr_int val);
+static int ber_decinteger(const char *buf, Odr_int *val, int max);
 
-int ber_integer(ODR o, int *val)
+int ber_integer(ODR o, Odr_int *val)
 {
     int res;
 
     switch (o->direction)
     {
     case ODR_DECODE:
-        if ((res = ber_decinteger(o->bp, val, odr_max(o))) <= 0)
+        if ((res = ber_decinteger(o->op->bp, val, odr_max(o))) <= 0)
         {
             odr_seterror(o, OPROTO, 50);
             return 0;
         }
-        o->bp += res;
+        o->op->bp += res;
         return 1;
     case ODR_ENCODE:
         if ((res = ber_encinteger(o, *val)) < 0)
@@ -61,20 +58,26 @@ int ber_integer(ODR o, int *val)
 /*
  * Returns: number of bytes written or -1 for error (out of bounds).
  */
-int ber_encinteger(ODR o, int val)
+int ber_encinteger(ODR o, Odr_int val)
 {
-    int a, len;
-    union { int i; unsigned char c[sizeof(int)]; } tmp;
-
-    tmp.i = htonl(val);   /* ensure that that we're big-endian */
-    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))))
+    unsigned long long uval = val;
+    unsigned char tmp[sizeof(uval)];
+    int len;
+    size_t i;
+    for (i = sizeof(uval); i > 0; )
+    {
+        tmp[--i] = (unsigned char ) uval; /* only want lower 8 bits */
+        uval >>= 8;
+    }
+    for (i = 0; i < sizeof(uval)-1; i++)
+        if (!((tmp[i] == 0 && !(tmp[i+1] & 0x80))
+              ||
+              (tmp[i] == 0xFF && (tmp[i+1] & 0x80))))
             break;
-    len = sizeof(int) - a;
+    len = sizeof(uval) - i;
     if (ber_enclen(o, len, 1, 1) != 1)
         return -1;
-    if (odr_write(o, (unsigned char*) tmp.c + a, len) < 0)
+    if (odr_write(o, (const char *) tmp + i, len) < 0)
         return -1;
     return 0;
 }
@@ -82,32 +85,29 @@ int ber_encinteger(ODR o, int val)
 /*
  * Returns: Number of bytes read or 0 if no match, -1 if error.
  */
-int ber_decinteger(const unsigned char *buf, int *val, int max)
+int ber_decinteger(const char *buf, Odr_int *val, int max)
 {
-    const unsigned char *b = buf;
-    unsigned char fill;
-    int res, len, remains;
-    union { int i; unsigned char c[sizeof(int)]; } tmp;
+    unsigned long long uval = 0;
+    int i, len;
+    int res;
+    const unsigned char *b = (const unsigned char *) buf;
 
-    if ((res = ber_declen(b, &len, max)) < 0)
+    if ((res = ber_declen((const char *) b, &len, max)) < 0)
         return -1;
     if (len+res > max || len < 0) /* out of bounds or indefinite encoding */
-        return -1;  
-    if (len > (int) sizeof(int))  /* let's be reasonable, here */
         return -1;
-    b+= res;
-
-    remains = sizeof(int) - len;
-    memcpy(tmp.c + remains, b, len);
-    if (*b & 0X80)
-        fill = 0XFF;
-    else
-        fill = 0X00;
-    memset(tmp.c, fill, remains);
-    *val = ntohl(tmp.i);
-
+    if (len > (int) sizeof(uval))  /* let's be reasonable, here */
+        return -1;
+    b += res;
+
+    if (*b & 0x80)
+        for (i = 0; i < (int) sizeof(uval) - len; i++)
+            uval = (uval << 8) + 0xFF;
+    for (i = 0; i < len; i++)
+        uval = (uval << 8) + b[i];
+    *val = uval;
     b += len;
-    return b - buf;
+    return (const char *) b - buf;
 }
 /*
  * Local variables: