X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_any.c;h=e167d426a2b5ba1eb6b05dfbb71ef59f86eac2a0;hp=8164e976f1fb4b2ff7908b1ae410d01e325a2954;hb=c82db01c9fc0b51254ec6ead5fe3b503ca098ca0;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35

diff --git a/src/ber_any.c b/src/ber_any.c
index 8164e97..e167d42 100644
--- a/src/ber_any.c
+++ b/src/ber_any.c
@@ -1,9 +1,9 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 
-/** 
+/**
  * \file ber_any.c
  * \brief Implements BER ANY encoding and decoding.
  *
@@ -21,7 +21,7 @@
 int ber_any(ODR o, Odr_any **p)
 {
     int res;
-    
+
     switch (o->direction)
     {
     case ODR_DECODE:
@@ -30,9 +30,12 @@ int ber_any(ODR o, Odr_any **p)
             odr_seterror(o, OPROTO, 2);
             return 0;
         }
-        (*p)->buf = (unsigned char *)odr_malloc(o, res);
+        (*p)->buf = (char *)odr_malloc(o, res);
         memcpy((*p)->buf, o->bp, res);
-        (*p)->len = (*p)->size = res;
+        (*p)->len = res;
+#if OCT_SIZE
+        (*p)->size = res;
+#endif
         o->bp += res;
         return 1;
     case ODR_ENCODE:
@@ -45,11 +48,11 @@ int ber_any(ODR o, Odr_any **p)
 
 #define BER_ANY_DEBUG 0
 
-int completeBER_n(const unsigned char *buf, int len, int level)
+int completeBER_n(const char *buf, int len, int level)
 {
     int res, ll, zclass, tag, cons;
-    const unsigned char *b = buf;
-    
+    const char *b = buf;
+
     if (level > 1000)
     {
 #if BER_ANY_DEBUG
@@ -74,7 +77,7 @@ int completeBER_n(const unsigned char *buf, int len, int level)
 #endif
         return -1;  /* error */
     }
-    if (res == -1)  
+    if (res == -1)
     {
 #if BER_ANY_DEBUG
         yaz_log(YLOG_LOG, "<<<<<<<<< return2 lev=%d res=%d", level, res);
@@ -109,10 +112,9 @@ int completeBER_n(const unsigned char *buf, int len, int level)
     {
         if (b[0] == 0 && b[1] == 0)
             break;
-        if (!(res = completeBER_n(b, len, level+1)))
-            return 0;
-        if (res == -1)
-            return -1;
+        res = completeBER_n(b, len, level+1);
+        if (res <= 0)
+            return res;
         b += res;
         len -= res;
     }
@@ -121,7 +123,7 @@ int completeBER_n(const unsigned char *buf, int len, int level)
     return (b - buf) + 2;
 }
 
-int completeBER(const unsigned char *buf, int len)
+int completeBER(const char *buf, int len)
 {
     int res = completeBER_n(buf, len, 0);
 #if BER_ANY_DEBUG