Add Zthes tag-set -- where was it?!

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

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index 46d7e2e..aa10414 100644 (file)
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -1,41 +1,22 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2002, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_bit.c,v $
- * 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.15 2002-07-25 12:51:08 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;
 
@@ -52,13 +33,13 @@ 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;
     }