X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_bit.c;h=25edfa0dcc7f8184be1b5766c0aec1c61755c565;hb=cb589c1cd95b040182aac4fb50d37bbf7107cde2;hp=b3dacbd12072d122ac1782a9938baab384fba0b8;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index b3dacbd..25edfa0 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.4  1995-02-09 15:51:47  quinn
+ * 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,23 +36,21 @@ 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)