X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=3c00d4750840dec5540a08bc890fba0c49afb3e6;hb=30d8d86b830a88f1c8f5fef944b6d36150651b9b;hp=76f726af7c7119f69b535c8d7c593c2bcf1c5ce1;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 76f726a..3c00d47 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $
- * Revision 1.11  1995-09-27 15:02:54  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
@@ -42,7 +51,7 @@
 
 #include <odr.h>
 
-int MDF ber_any(ODR o, Odr_any **p)
+int ber_any(ODR o, Odr_any **p)
 {
     int res;
 
@@ -54,7 +63,7 @@ int MDF 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;
@@ -71,16 +80,16 @@ int MDF ber_any(ODR o, Odr_any **p)
 /*
  * Return length of BER-package or 0.
  */
-int MDF completeBER(unsigned char *buf, int len)
+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;