X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_bit.c;h=f20a252927d2ed2414cbd38bc2b5c50f9d5dbbcc;hb=bf3c907b04a3a1dd708f90ce08328014775758af;hp=80434b72eaa108fc92a7d37d37d76057cda66aee;hpb=173d9f50b7a6c63dff6c74dc5c3efe985f75ef39;p=yaz-moved-to-github.git

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index 80434b7..f20a252 100644
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bit.c,v $
- * Revision 1.1  1995-02-02 20:38:50  quinn
+ * 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
+ * Bug fixes.
+ *
+ * Revision 1.2  1995/02/03  17:04:37  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.1  1995/02/02  20:38:50  quinn
  * Updates.
  *
  *
@@ -17,7 +29,7 @@
  * Top level bitstring string en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_bitstring(ODR o, ODR_BITMASK **p, int opt)
+int odr_bitstring(ODR o, Odr_bitmask **p, int opt)
 {
     int res, cons = 0;
 
@@ -26,21 +38,18 @@ int odr_bitstring(ODR o, ODR_BITMASK **p, int opt)
     	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)) < 0)
     	return 0;
     if (!res)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "BITSTRING(len=%d)\n", (*p)->top + 1);
+    	fprintf(o->print, "%sBITSTRING(len=%d)\n", odr_indent(o), (*p)->top + 1);
     	return 1;
     }
-    if (o->direction == ODR_DECODE && !*p)
+    if (o->direction == ODR_DECODE)
     {
-    	*p = nalloc(o, sizeof(ODR_BITMASK));
+    	*p = nalloc(o, sizeof(Odr_bitmask));
     	memset((*p)->bits, 0, ODR_BITMASK_SIZE);
     	(*p)->top = -1;
     }