Improved installation. Moved header files to include/yaz.

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

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index 5deb9cd..d744e54 100644 (file)
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bit.c,v $
- * Revision 1.9  1995-09-27 15:02:58  quinn
+ * Revision 1.13  1999-11-30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.12  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.11  1998/02/11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10  1995/09/29 17:12:22  quinn
+ * Smallish
+ *
+ * Revision 1.9  1995/09/27  15:02:58  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.8  1995/05/16  08:50:51  quinn
@@ -34,14 +47,14 @@
  *
  */
 
-#include <odr.h>
 #include <string.h>
+#include <yaz/odr.h>
 
 /*
  * Top level bitstring string en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int MDF 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;
 
@@ -58,13 +71,13 @@ int MDF 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;
     }