X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_oid.c;h=7e7e1b80a4ebf16ec62a1bf438f67003715c3479;hp=f6d005de22e34e23ea31c9491dd6c9ad1f6becab;hb=59526fbbf2e3b54ce94b3e79e6c7fef9e4f456fb;hpb=d4081206ab9bd0ed0c97c032d264ad1e1d4a051e

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index f6d005d..7e7e1b8 100644
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -1,10 +1,29 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $
- * Revision 1.10  1995-05-29 08:11:44  quinn
+ * Revision 1.16  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.15  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * 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
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.10  1995/05/29  08:11:44  quinn
  * Moved oid from odr/asn to util.
  *
  * Revision 1.9  1995/05/16  08:50:57  quinn
@@ -36,15 +55,18 @@
  *
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <oid.h>
+#include <yaz/odr.h>
+#include <yaz/oid.h>
 
 /*
  * 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;
 
@@ -68,13 +90,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);
 }