X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_oct.c;h=898ad4da023d9a447de8560e3818a072fdb1448d;hb=045c1b65972cd05508ff188e201c17e5da571b43;hp=6fde92022ecf97d3515208f10f18a232a809c3bb;hpb=e147ddf129696b470aed3cfcdb405af84ee56ef6;p=yaz-moved-to-github.git

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 6fde920..898ad4d 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,10 +1,21 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oct.c,v $
- * Revision 1.13  1999-04-20 09:56:48  adam
+ * Revision 1.16  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.15  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.14  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.13  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.
  *
@@ -46,8 +57,11 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include <yaz/odr.h>
 
 int ber_octetstring(ODR o, Odr_oct *p, int cons)
 {
@@ -64,7 +78,6 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 	    	return 0;
 	    }
 	    o->bp += res;
-	    o->left -= res;
 	    if (cons)       /* fetch component strings */
 	    {
 	    	base = o->bp;
@@ -90,7 +103,6 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 		memcpy(p->buf + p->len, o->bp, len);
 	    p->len += len;
 	    o->bp += len;
-	    o->left -= len;
 	    return 1;
     	case ODR_ENCODE:
 	    if ((res = ber_enclen(o, p->len, 5, 0)) < 0)