X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oid.c;h=2072903c78c1d9ad2fbb0e7e5437100eb598f31e;hb=aa45b978839c268db6eccafc6a13452d99a7929c;hp=633101b242c82165c344206aca45e6fa8a0200f2;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55;p=yaz-moved-to-github.git

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index 633101b..2072903 100644
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $
- * Revision 1.7  1995-03-08 12:12:29  quinn
+ * 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
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.8  1995/03/17  10:17:55  quinn
+ * Added memory management.
+ *
+ * Revision 1.7  1995/03/08  12:12:29  quinn
  * Added better error checking.
  *
  * Revision 1.6  1995/03/01  08:40:56  quinn
@@ -29,12 +41,13 @@
  */
 
 #include <odr.h>
+#include <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 MDF odr_oid(ODR o, Odr_oid **p, int opt)
 {
     int res, cons = 0;
 
@@ -65,6 +78,6 @@ int odr_oid(ODR o, Odr_oid **p, int opt)
     	return 1;
     }
     if (o->direction == ODR_DECODE)
-    	*p = nalloc(o, ODR_OID_SIZE * sizeof(**p));
+    	*p = odr_malloc(o, OID_SIZE * sizeof(**p));
     return ber_oidc(o, *p);
 }