X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fber_any.c;h=3322a02a451a8d2c5566ee933b59f19648deef74;hb=883245e48ad6e5735ab73884e18dc6cb5c297c86;hp=0c73bd73c6f24fe27327bd08352850847d6e3a8d;hpb=346311370361ec56af79a2f7756c9a8db4f55a68;p=yaz-moved-to-github.git

diff --git a/src/ber_any.c b/src/ber_any.c
index 0c73bd7..3322a02 100644
--- a/src/ber_any.c
+++ b/src/ber_any.c
@@ -1,11 +1,9 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_any.c,v 1.5 2006-08-24 13:10:03 adam Exp $
  */
 
-/** 
+/**
  * \file ber_any.c
  * \brief Implements BER ANY encoding and decoding.
  *
@@ -23,7 +21,7 @@
 int ber_any(ODR o, Odr_any **p)
 {
     int res;
-    
+
     switch (o->direction)
     {
     case ODR_DECODE:
@@ -51,7 +49,7 @@ int completeBER_n(const unsigned char *buf, int len, int level)
 {
     int res, ll, zclass, tag, cons;
     const unsigned char *b = buf;
-    
+
     if (level > 1000)
     {
 #if BER_ANY_DEBUG
@@ -76,7 +74,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);
@@ -111,10 +109,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;
     }
@@ -136,6 +133,7 @@ int completeBER(const unsigned char *buf, int len)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab