X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fber_bit.c;h=6f9dcdc1c9b4d174b19381c3f3ea0a37a61e2c23;hp=4549f742f1f0fd0e12d2935ba1f9a88aba6b8f2a;hb=a49837cbe6fcbeeb9ce857b0eeb942619ba80b5e;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index 4549f74..6f9dcdc 100644
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bit.c,v $
- * Revision 1.3  1995-03-08 12:12:04  quinn
+ * Revision 1.7  1995-09-29 17:12:16  quinn
+ * Smallish
+ *
+ * Revision 1.6  1995/09/27  15:02:54  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/05/16  08:50:43  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/04/18  08:15:13  quinn
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * Revision 1.3  1995/03/08  12:12:04  quinn
  * Added better error checking.
  *
  * Revision 1.2  1995/02/03  17:04:31  quinn
@@ -63,25 +76,14 @@ int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 	    o->left -= len;
 	    return 1;
     	case ODR_ENCODE:
-	    if ((res = ber_enclen(o->bp, p->top + 2, 5, 0)) < 0)
-	    {
-	    	o->error = OOTHER;
+	    if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)
 	    	return 0;
-	    }
-	    o->bp += res;
-	    o->left -= res;
-	    if (p->top + 2 > o->left)
-	    {
-	    	o->error = OSPACE;
+	    if (odr_putc(o, 0) < 0)    /* no unused bits here */
 	    	return 0;
-	    }
-	    *(o->bp++) = 0;    /* no unused bits here */
-	    o->left--;
 	    if (p->top < 0)
 	    	return 1;
-	    memcpy(o->bp, p->bits, p->top + 1);
-	    o->bp += p->top + 1;
-	    o->left -= p->top +1;
+	    if (odr_write(o, p->bits, p->top + 1) < 0)
+	    	return 0;
 	    return 1;
     	case ODR_PRINT: return 1;
     	default: o->error = OOTHER; return 0;