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 4549f74..1733226 100644 (file)
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,27 +1,21 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2002, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: ber_bit.c,v $
- * 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)
     {
@@ -32,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;
            }
@@ -55,33 +48,20 @@ 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->bp, p->top + 2, 5, 0)) < 0)
-           {
-               o->error = OOTHER;
+           if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)
                return 0;
-           }
-           o->bp += res;
-           o->left -= res;
-           if (p->top + 2 > o->left)
-           {
-               o->error = OSPACE;
+           if (odr_putc(o, 0) < 0)    /* no unused bits here */
                return 0;
-           }
-           *(o->bp++) = 0;    /* no unused bits here */
-           o->left--;
            if (p->top < 0)
                return 1;
-           memcpy(o->bp, p->bits, p->top + 1);
-           o->bp += p->top + 1;
-           o->left -= p->top +1;
+           if (odr_write(o, p->bits, p->top + 1) < 0)
+               return 0;
            return 1;
        case ODR_PRINT: return 1;
        default: o->error = OOTHER; return 0;