Check for config.h (currently not generated).

[yaz-moved-to-github.git] / odr / ber_tag.c

diff --git a/odr/ber_tag.c b/odr/ber_tag.c
index dcfd8ae..03b9c79 100644 (file)
--- a/odr/ber_tag.c
+++ b/odr/ber_tag.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_tag.c,v $
- * Revision 1.19  1999-01-08 11:23:25  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/01/08 11:23:25  adam
  * Added const modifier to some of the BER/ODR encoding routines.
  *
  * Revision 1.18  1998/02/11 11:53:34  adam
@@ -65,9 +76,12 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
-#include <odr.h>
+#include <yaz/odr.h>
 
 /* ber_tag
  * On encoding:
@@ -91,7 +105,7 @@ int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt)
     if (o->stackp < 0)
     {
        odr_seek(o, ODR_S_SET, 0);
-        o->ecb.top = 0;
+        o->top = 0;
        o->bp = o->buf;
         odr_ber_tag->lclass = -1;
     }
@@ -137,7 +151,6 @@ int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt)
                if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
                {
                    o->bp += odr_ber_tag->br;
-                   o->left -= odr_ber_tag->br;
                    *constructed = odr_ber_tag->lcons;
                    odr_ber_tag->lclass = -1;
                    return 1;