X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_bit.c;h=5cae8331b9544464c1867dd55c5d63992ac07f91;hb=05d1794c4ac57eabe6f6da766156f6986d5c987c;hp=94bc0a28fe401f07fe8c29c25dadfc5b7b8baa5f;hpb=99268f722648e84bf5c54eb685a1434e100f38a1;p=yaz-moved-to-github.git

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index 94bc0a2..5cae833 100644
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -1,44 +1,22 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_bit.c,v $
- * 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
- * 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.
- *
- *
+ * $Id: odr_bit.c,v 1.17 2003-04-24 12:48:47 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
 #include <string.h>
+#include "odr-priv.h"
 
 /*
  * 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, const char *name)
 {
     int res, cons = 0;
 
@@ -55,15 +33,22 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt)
     	return opt;
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "%sBITSTRING(len=%d)\n", odr_indent(o),
-	    (*p)->top + 1);
+	odr_prname(o, name);
+    	fprintf(o->print, "BITSTRING(len=%d)\n",(*p)->top + 1);
     	return 1;
     }
     if (o->direction == ODR_DECODE)
     {
-    	*p = odr_malloc(o, sizeof(Odr_bitmask));
+    	*p = (Odr_bitmask *)odr_malloc(o, sizeof(Odr_bitmask));
     	memset((*p)->bits, 0, ODR_BITMASK_SIZE);
     	(*p)->top = -1;
     }
+#if 0
+    /* ignoring the cons helps with at least one target. 
+     * http://bugzilla.indexdata.dk/cgi-bin/bugzilla/show_bug.cgi?id=24
+     */
+    return ber_bitstring(o, *p, 0);
+#else
     return ber_bitstring(o, *p, cons);
+#endif
 }