X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_tag.c;h=8dc5e17ac55ad6b7d7df3334f02376d437b9d3e6;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=9e6d3624fac1ab48c1ffe92b68c6d5477c94188d;hpb=d690f39cdf024d17ef66fa7ef980c8804f3d7618;p=yaz-moved-to-github.git

diff --git a/odr/ber_tag.c b/odr/ber_tag.c
index 9e6d362..8dc5e17 100644
--- a/odr/ber_tag.c
+++ b/odr/ber_tag.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1997, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_tag.c,v $
- * Revision 1.15  1997-09-01 08:51:06  adam
+ * 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.
@@ -66,16 +75,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)
 {
-#if 0
-    static int lclass = -1, ltag, br, lcons; /* save t&c rather than
-						decoding twice */
-#endif
     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;
@@ -119,10 +124,12 @@ int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt)
                     o->error = OPROTO;
 		            return 0;
                 }
-    #ifdef ODR_DEBUG
-		        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
+#ifdef ODR_DEBUG
+		    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 == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
 	        {