X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=39ebd2545844648ed021d3deefca2fc2ae15a1b8;hb=c0903fd5f123d300c1a107af6cbd6f70631fcf32;hp=bebfbb3fb3e5ef7fe9d25d6b9cc6637746fac448;hpb=21ea17f766bb492a93154ec7b242653fa37dec91;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index bebfbb3..39ebd25 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,10 +1,17 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $
- * Revision 1.15  1999-01-08 11:23:20  adam
+ * Revision 1.17  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.16  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.15  1999/01/08 11:23:20  adam
  * Added const modifier to some of the BER/ODR encoding routines.
  *
  * Revision 1.14  1998/02/11 11:53:34  adam
@@ -52,16 +59,17 @@
  *
  */
 
-#include <odr.h>
+#include <yaz/odr.h>
 
 int ber_any(ODR o, Odr_any **p)
 {
     int res;
+    int left = o->size - (o->bp - o->buf);
 
     switch (o->direction)
     {
     	case ODR_DECODE:
-	    if ((res = completeBER(o->bp, o->left)) <= 0)        /* FIX THIS */
+	    if ((res = completeBER(o->bp, left)) <= 0)        /* FIX THIS */
 	    {
 	    	o->error = OPROTO;
 	    	return 0;
@@ -70,7 +78,6 @@ int ber_any(ODR o, Odr_any **p)
 	    memcpy((*p)->buf, o->bp, res);
 	    (*p)->len = (*p)->size = res;
 	    o->bp += res;
-	    o->left -= res;
 	    return 1;
     	case ODR_ENCODE:
 	    if (odr_write(o, (*p)->buf, (*p)->len) < 0)