X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oid.c;h=7d147f2b54173014550bc61e67557995d1d3ce47;hb=a19243ec18959150a30c63c521fc5b0af860ce18;hp=94025f67f31bf673111153c2584bfd4ecd401f73;hpb=63cafe41a93427118959a74201b3e331169a71d9;p=yaz-moved-to-github.git

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index 94025f6..7d147f2 100644
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -1,10 +1,17 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $
- * Revision 1.12  1995-09-29 17:12:25  quinn
+ * Revision 1.14  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.13  1998/02/11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.12  1995/09/29 17:12:25  quinn
  * Smallish
  *
  * Revision 1.11  1995/09/27  15:03:00  quinn
@@ -50,7 +57,7 @@
  * Top level oid en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_oid(ODR o, Odr_oid **p, int opt)
+int odr_oid(ODR o, Odr_oid **p, int opt, const char *name)
 {
     int res, cons = 0;
 
@@ -74,13 +81,14 @@ int odr_oid(ODR o, Odr_oid **p, int opt)
     {
     	int i;
 
-    	fprintf(o->print, "%sOID:", odr_indent(o));
+	odr_prname(o, name);
+    	fprintf(o->print, "OID:");
     	for (i = 0; (*p)[i] > -1; i++)
 	    fprintf(o->print, " %d", (*p)[i]);
 	fprintf(o->print, "\n");
     	return 1;
     }
     if (o->direction == ODR_DECODE)
-    	*p = odr_malloc(o, OID_SIZE * sizeof(**p));
+    	*p = (int *)odr_malloc(o, OID_SIZE * sizeof(**p));
     return ber_oidc(o, *p);
 }