X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_util.c;h=0ea1c0803c3cab2d0e3efe2ec95e0ce64571e544;hb=57a0976b6e7d84f77a08dcd4cf03d6656dae60d4;hp=16dc98471aea3bf6c0f7b63fd4f88bb67af9e023;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/odr_util.c b/odr/odr_util.c
index 16dc984..0ea1c08 100644
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -1,7 +1,5 @@
-#include <odr.h>
 #include <stdlib.h>
-
-void *nalloc(ODR o, int size) { return malloc(size); }
+#include <odr.h>
 
 char *odr_indent(ODR o)
 {
@@ -30,3 +28,53 @@ int odp_more_chunks(ODR o, unsigned char *base, int len)
     else
         return o->bp - base < len;
 }
+
+/* OID utilities */
+
+void odr_oidcpy(Odr_oid *t, Odr_oid *s)
+{
+    while ((*(t++) = *(s++)) > -1);
+}
+
+void odr_oidcat(Odr_oid *t, Odr_oid *s)
+{
+    while (*t > -1)
+    	t++;
+    while ((*(t++) = *(s++)) > -1);
+}
+
+int odr_oidcmp(Odr_oid *o1, Odr_oid *o2)
+{
+    while (*o1 == *o2 && *o1 > -1)
+    {
+    	o1++;
+	o2++;
+    }
+    if (*o1 == *o2)
+    	return 0;
+    else if (*o1 > *o2)
+    	return 1;
+    else
+    	return -1;
+}
+
+int odr_oidlen(Odr_oid *o)
+{
+    int len = 0;
+
+    while (*(o++) >= 0)
+    	len++;
+    return len;
+}
+
+Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
+{
+    Odr_oid *r;
+
+    if (!o)
+    	return 0;
+    if (!(r = odr_malloc(odr, (odr_oidlen(o) + 1) * sizeof(Odr_oid))))
+    	return 0;
+    odr_oidcpy(r, o);
+    return r;
+}