X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_bit.c;h=46d7e2e95b3d564cdd38b52e6d5594d68ee52f49;hb=c3a132ce4aea3bb358b185ef58781b4bef8745fc;hp=f20a252927d2ed2414cbd38bc2b5c50f9d5dbbcc;hpb=6d0cb38e2fd32c722b0af63ce050ac5c458d849f;p=yaz-moved-to-github.git

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index f20a252..46d7e2e 100644
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bit.c,v $
- * Revision 1.5  1995-02-10 18:57:25  quinn
+ * 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
@@ -33,23 +39,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 ((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)
     	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;
     }