X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=3c00d4750840dec5540a08bc890fba0c49afb3e6;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=51dc7f3e5baded2995c244e5176571548d01810e;hpb=99268f722648e84bf5c54eb685a1434e100f38a1;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 51dc7f3..3c00d47 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $
- * Revision 1.10  1995-05-16 08:50:42  quinn
+ * Revision 1.14  1998-02-11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.13  1997/05/14 06:53:56  adam
+ * C++ support.
+ *
+ * Revision 1.12  1995/09/29 17:12:15  quinn
+ * Smallish
+ *
+ * Revision 1.11  1995/09/27  15:02:54  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.10  1995/05/16  08:50:42  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.9  1995/04/18  08:15:12  quinn
@@ -51,7 +63,7 @@ int ber_any(ODR o, Odr_any **p)
 	    	o->error = OPROTO;
 	    	return 0;
 	    }
-	    (*p)->buf = odr_malloc(o, res);
+	    (*p)->buf = (unsigned char *)odr_malloc(o, res);
 	    memcpy((*p)->buf, o->bp, res);
 	    (*p)->len = (*p)->size = res;
 	    o->bp += res;
@@ -70,14 +82,14 @@ int ber_any(ODR o, Odr_any **p)
  */
 int completeBER(unsigned char *buf, int len)
 {
-    int res, ll, class, tag, cons;
+    int res, ll, zclass, tag, cons;
     unsigned char *b = buf;
     
     if (!len)
     	return 0;
     if (!buf[0] && !buf[1])
     	return 0;
-    if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
+    if ((res = ber_dectag(b, &zclass, &tag, &cons)) <= 0)
     	return 0;
     if (res > len)
     	return 0;