Updated.

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

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index b3dacbd..1407116 100644 (file)
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -1,10 +1,28 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bit.c,v $
- * Revision 1.4  1995-02-09 15:51:47  quinn
+ * Revision 1.10  1995-09-29 17:12:22  quinn
+ * Smallish
+ *
+ * Revision 1.9  1995/09/27  15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.8  1995/05/16  08:50:51  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.7  1995/03/17  10:17:48  quinn
+ * Added memory management.
+ *
+ * Revision 1.6  1995/03/08  12:12:19  quinn
+ * Added better error checking.
+ *
+ * Revision 1.5  1995/02/10  18:57:25  quinn
+ * More in the way of error-checking.
+ *
+ * Revision 1.4  1995/02/09  15:51:47  quinn
  * Works better now.
  *
  * Revision 1.3  1995/02/07  14:13:45  quinn
@@ -30,28 +48,26 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt)
 {
     int res, cons = 0;
 
+    if (o->error)
+       return 0;
     if (o->t_class < 0)
     {
        o->t_class = ODR_UNIVERSAL;
        o->t_tag = ODR_BITSTRING;
     }
-    if (o->direction == ODR_DECODE)
-       *p = 0;
-    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
        return 0;
     if (!res)
-    {
-       *p = 0;
        return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
-       fprintf(o->print, "%sBITSTRING(len=%d)\n", odr_indent(o), (*p)->top + 1);
+       fprintf(o->print, "%sBITSTRING(len=%d)\n", odr_indent(o),
+           (*p)->top + 1);
        return 1;
     }
     if (o->direction == ODR_DECODE)
     {
-       *p = nalloc(o, sizeof(Odr_bitmask));
+       *p = odr_malloc(o, sizeof(Odr_bitmask));
        memset((*p)->bits, 0, ODR_BITMASK_SIZE);
        (*p)->top = -1;
     }