Add Zthes tag-set -- where was it?!

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

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index d939426..1733226 100644 (file)
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,34 +1,21 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: ber_bit.c,v $
- * Revision 1.5  1995-05-16 08:50:43  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.4  1995/04/18  08:15:13  quinn
- * Added dynamic memory allocation on encoding (whew). Code is now somewhat
- * neater. We'll make the same change for decoding one day.
- *
- * Revision 1.3  1995/03/08  12:12:04  quinn
- * Added better error checking.
- *
- * Revision 1.2  1995/02/03  17:04:31  quinn
- * *** empty log message ***
- *
- * Revision 1.1  1995/02/02  20:38:49  quinn
- * Updates.
- *
+ * $Id: ber_bit.c,v 1.13 2002-07-25 12:51:08 adam Exp $
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 {
     int res, len;
-    unsigned char *base;
+    const unsigned char *base;
 
     switch (o->direction)
     {
@@ -39,12 +26,11 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
                return 0;
            }
            o->bp += res;
-           o->left -= res;
            if (cons)       /* fetch component strings */
            {
                base = o->bp;
                while (odp_more_chunks(o, base, len))
-                   if (!odr_bitstring(o, &p, 0))
+                   if (!odr_bitstring(o, &p, 0, 0))
                        return 0;
                return 1;
            }
@@ -62,12 +48,10 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
                return 0;
            }
            o->bp++;      /* silently ignore the unused-bits field */
-           o->left--;
            len--;
            memcpy(p->bits + p->top + 1, o->bp, len);
            p->top += len;
            o->bp += len;
-           o->left -= len;
            return 1;
        case ODR_ENCODE:
            if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)