X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_cons.c;h=c74229c297e16c79a733ec15fbc67280d616162c;hb=045c1b65972cd05508ff188e201c17e5da571b43;hp=1664320f79f79b851b3ba154f4f77c0412272f50;hpb=e147ddf129696b470aed3cfcdb405af84ee56ef6;p=yaz-moved-to-github.git

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index 1664320..c74229c 100644
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.19  1999-04-20 09:56:48  adam
+ * Revision 1.22  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.21  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.20  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.19  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.
  *
@@ -64,9 +74,11 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <assert.h>
+#include <yaz/odr.h>
 
 void odr_setlenlen(ODR o, int len)
 {
@@ -118,7 +130,6 @@ int odr_constructed_begin(ODR o, void *p, int zclass, int tag,
 	    return 0;
 	o->stack[o->stackp].lenlen = res;
 	o->bp += res;
-	o->left -= res;
     }
     else if (o->direction == ODR_PRINT)
     {
@@ -167,7 +178,6 @@ int odr_constructed_end(ODR o)
 	    {
 	    	if (*o->bp++ == 0 && *(o->bp++) == 0)
 	    	{
-		    o->left -= 2;
 		    o->stackp--;
 		    return 1;
 		}
@@ -212,7 +222,6 @@ int odr_constructed_end(ODR o)
 	    o->stackp--;
 	    return 1;
     	case ODR_PRINT:
-	    assert(o->indent > 0);
 	    o->stackp--;
 	    o->indent--;
 	    odr_prname(o, 0);