Modified function heads & prototypes.

[yaz-moved-to-github.git] / odr / odr_util.c

diff --git a/odr/odr_util.c b/odr/odr_util.c
index 16dc984..a25d1ad 100644 (file)
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -1,18 +1,20 @@
-#include <odr.h>
 #include <stdlib.h>
+#include <odr.h>
+#include <oid.h>
 
-void *nalloc(ODR o, int size) { return malloc(size); }
-
-char *odr_indent(ODR o)
+char MDF *odr_indent(ODR o)
 {
     static char buf[512];
+    int i = o->indent;
 
     memset(buf, ' ', 512);
+    if (i >= 128)
+       i = 127;
     buf[o->indent * 4] = 0;
     return buf;
 }
 
-int odp_more_chunks(ODR o, unsigned char *base, int len)
+int MDF odp_more_chunks(ODR o, unsigned char *base, int len)
 {
     if (!len)
        return 0;
@@ -30,3 +32,15 @@ int odp_more_chunks(ODR o, unsigned char *base, int len)
     else
         return o->bp - base < len;
 }
+
+Odr_oid MDF *odr_oiddup(ODR odr, Odr_oid *o)
+{
+    Odr_oid *r;
+
+    if (!o)
+       return 0;
+    if (!(r = odr_malloc(odr, (oid_oidlen(o) + 1) * sizeof(int))))
+       return 0;
+    oid_oidcpy(r, o);
+    return r;
+}