X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_bit.c;h=666d32919f38ad3f7c1993ec89af176ab719d6d2;hb=695e6df9fce9b838cb3fe8f49b211ed99943caef;hp=d95336b994ec66967d76a0b4658f192edf56518d;hpb=21ea17f766bb492a93154ec7b242653fa37dec91;p=yaz-moved-to-github.git

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index d95336b..666d329 100644
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bit.c,v $
- * Revision 1.8  1999-01-08 11:23:21  adam
+ * Revision 1.12  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.11  2000/01/31 13:15:21  adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.10  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.9  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.8  1999/01/08 11:23:21  adam
  * Added const modifier to some of the BER/ODR encoding routines.
  *
  * Revision 1.7  1995/09/29 17:12:16  quinn
@@ -31,8 +46,11 @@
  *
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include <yaz/odr.h>
 
 int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 {
@@ -48,12 +66,11 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 	    	return 0;
 	    }
 	    o->bp += res;
-	    o->left -= res;
 	    if (cons)       /* fetch component strings */
 	    {
 	    	base = o->bp;
 	    	while (odp_more_chunks(o, base, len))
-		    if (!odr_bitstring(o, &p, 0))
+		    if (!odr_bitstring(o, &p, 0, 0))
 		    	return 0;
 		return 1;
 	    }
@@ -71,12 +88,10 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 	    	return 0;
 	    }
 	    o->bp++;      /* silently ignore the unused-bits field */
-	    o->left--;
 	    len--;
 	    memcpy(p->bits + p->top + 1, o->bp, len);
 	    p->top += len;
 	    o->bp += len;
-	    o->left -= len;
 	    return 1;
     	case ODR_ENCODE:
 	    if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)