X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fber_tag.c;h=03b9c79b4fea0633bd3806c52752f6675140c971;hp=de1ad361af83513eef89803749fe0b25e68b46b8;hb=19af2bd8dfd21731cc978beccd1346133d614c67;hpb=bf4149c63ad2e11429e302a89f472de52b4d7ce8

diff --git a/odr/ber_tag.c b/odr/ber_tag.c
index de1ad36..03b9c79 100644
--- a/odr/ber_tag.c
+++ b/odr/ber_tag.c
@@ -1,10 +1,38 @@
 /*
- * Copyright (c) 1995, 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.14  1997-05-14 06:53:56  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
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.17  1997/09/30 09:33:10  adam
+ * Minor changes - removed indentation of ifdef.
+ *
+ * Revision 1.16  1997/09/17 12:10:33  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.15  1997/09/01 08:51:06  adam
+ * New windows NT/95 port using MSV5.0. Had to avoid a few static
+ * variables used in function ber_tag. These are now part of the
+ * ODR structure.
+ *
+ * Revision 1.14  1997/05/14 06:53:56  adam
  * C++ support.
  *
  * Revision 1.13  1995/09/29 17:12:21  quinn
@@ -48,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:
@@ -61,13 +92,12 @@
  *      else leave pointer unchanged. Return 0.
  *
  * Should perhaps be odr_tag?
-*/
+ */
 int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt)
 {
-    static int lclass = -1, ltag, br, lcons; /* save t&c rather than
-						decoding twice */
+    Odr_ber_tag *odr_ber_tag = &o->odr_ber_tag;
     int rd;
-    char **pp = p;
+    char **pp = (char **)p;
 
     if (o->direction == ODR_DECODE)
     	*pp = 0;
@@ -75,64 +105,69 @@ 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;
-    	lclass = -1;
+        odr_ber_tag->lclass = -1;
     }
     switch (o->direction)
     {
     	case ODR_ENCODE:
-	    if (!*pp)
-	    {
-	    	if (!opt)
-		    o->error = OREQUIRED;
-	    	return 0;
-	    }
-	    if ((rd = ber_enctag(o, zclass, tag, *constructed)) < 0)
-		return -1;
+	        if (!*pp)
+	        {
+	    	    if (!opt)
+		        o->error = OREQUIRED;
+	    	    return 0;
+	        }
+	        if ((rd = ber_enctag(o, zclass, tag, *constructed)) < 0)
+    		    return -1;
 #ifdef ODR_DEBUG
-	    fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", zclass, tag,
-		*constructed, o->stackp);
+    	    fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", zclass, tag,
+	            	*constructed, o->stackp);
 #endif
-	    return 1;
+	        return 1;
+
     	case ODR_DECODE:
-	    if (o->stackp > -1 && !odr_constructed_more(o))
-	    {
-	    	if (!opt)
-		    o->error = OREQUIRED;
-	    	return 0;
-	    }
-	    if (lclass < 0)
-	    {
-	    	if ((br = ber_dectag(o->bp, &lclass, &ltag, &lcons)) <= 0)
-		{
-		    o->error = OPROTO;
-		    return 0;
-		}
+	        if (o->stackp > -1 && !odr_constructed_more(o))
+            {
+	    	    if (!opt)
+		            o->error = OREQUIRED;
+	    	    return 0;
+	        }
+	        if (odr_ber_tag->lclass < 0)
+	        {
+	    	    if ((odr_ber_tag->br = ber_dectag(o->bp, &odr_ber_tag->lclass,
+                                     &odr_ber_tag->ltag, &odr_ber_tag->lcons)) <= 0)
+                {
+                    o->error = OPROTO;
+		            return 0;
+                }
 #ifdef ODR_DEBUG
-		fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", lclass, ltag,
-		    lcons, o->stackp);
+		    fprintf(stderr,
+			    "\n[class=%d,tag=%d,cons=%d,stackp=%d]",
+			    odr_ber_tag->lclass, odr_ber_tag->ltag,
+			    odr_ber_tag->lcons, o->stackp);
 #endif
-	    }
-	    if (zclass == lclass && tag == ltag)
-	    {
-	    	o->bp += br;
-	    	o->left -= br;
-	    	*constructed = lcons;
-	    	lclass = -1;
-	    	return 1;
-	    }
-	    else
-	    {
-	    	if (!opt)
-		    o->error = OREQUIRED;
-	    	return 0;
-	    }
+	        }
+	        if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
+	        {
+	    	    o->bp += odr_ber_tag->br;
+	    	    *constructed = odr_ber_tag->lcons;
+	    	    odr_ber_tag->lclass = -1;
+	    	    return 1;
+	        }
+	        else
+	        {
+	    	    if (!opt)
+		            o->error = OREQUIRED;
+	    	    return 0;
+	        }
     	case ODR_PRINT:
-		if (!*pp && !opt)
-		    o->error = OREQUIRED;
-		return *pp != 0;
-    	default: o->error = OOTHER; return 0;
+		    if (!*pp && !opt)
+		        o->error = OREQUIRED;
+		    return *pp != 0;
+    	default:
+            o->error = OOTHER;
+            return 0;
     }
 }
 
@@ -180,9 +215,9 @@ int ber_enctag(ODR o, int zclass, int tag, int constructed)
 /* ber_dectag
  * Decode BER identifier octets. Return number of bytes read or -1 for error.
  */
-int ber_dectag(unsigned char *buf, int *zclass, int *tag, int *constructed)
+int ber_dectag(const unsigned char *buf, int *zclass, int *tag, int *constructed)
 {
-    unsigned char *b = buf;
+    const unsigned char *b = buf;
 
     *zclass = *b >> 6;
     *constructed = (*b >> 5) & 0X01;