X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_oid.c;h=cf75c66a4a8e65437a5967a058109981ab812eba;hb=9a13337111b32d256182a4248f93ebe26e393059;hp=58b76379b99e4c1a10ccc1a7f03e9f722ca5e56e;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/odr/ber_oid.c b/odr/ber_oid.c
index 58b7637..cf75c66 100644
--- a/odr/ber_oid.c
+++ b/odr/ber_oid.c
@@ -1,10 +1,24 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oid.c,v $
- * Revision 1.8  1995-09-27 15:02:56  quinn
+ * 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  1995/09/29 17:12:19  quinn
+ * Smallish
+ *
+ * Revision 1.8  1995/09/27  15:02:56  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.7  1995/05/16  08:50:47  quinn
@@ -30,10 +44,13 @@
  * Initial revision
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include <yaz/odr.h>
 
-int MDF ber_oidc(ODR o, Odr_oid *p)
+int ber_oidc(ODR o, Odr_oid *p)
 {
     int len, lenp, end;
     int pos, n, res, id;
@@ -53,7 +70,6 @@ int MDF ber_oidc(ODR o, Odr_oid *p)
 	    	return 0;
 	    }
 	    o->bp += res;
-	    o->left -= res;
 	    if (len == 0)
 	    {
 	    	*p = -1;
@@ -64,7 +80,6 @@ int MDF ber_oidc(ODR o, Odr_oid *p)
 	    	p[0] = 2;
 	    p[1] = *o->bp - p[0] * 40;
 	    o->bp++;
-	    o->left--;
 	    pos = 2;
 	    len--;
 	    while (len)
@@ -80,7 +95,6 @@ int MDF ber_oidc(ODR o, Odr_oid *p)
 		    p[pos] <<= 7;
 		    p[pos] |= *o->bp & 0X7F;
 		    len--;
-		    o->left--;
 		}
 		while (*(o->bp++) & 0X80);
 		pos++;