X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_util.c;h=0cee5397764a537ffe8555032c2f959245d7977b;hp=a25d1ad44e4ca4ba25a7acb0b28fd2fd6aec98a7;hb=068a5a7412f492019b4d6f5e89158098d44368f7;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4

diff --git a/odr/odr_util.c b/odr/odr_util.c
index a25d1ad..0cee539 100644
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -1,8 +1,23 @@
+/*
+ * Copyright (c) 1995-1997, Index Data
+ * See the file LICENSE for details.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: odr_util.c,v $
+ * Revision 1.12  1997-10-31 12:20:08  adam
+ * Improved memory debugging for xmalloc/nmem.c. References to NMEM
+ * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
+ * Bug fix: missing fclose in data1_read_espec1.
+ *
+ */
+
 #include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
 #include <odr.h>
 #include <oid.h>
 
-char MDF *odr_indent(ODR o)
+char *odr_indent(ODR o)
 {
     static char buf[512];
     int i = o->indent;
@@ -14,7 +29,7 @@ char MDF *odr_indent(ODR o)
     return buf;
 }
 
-int MDF odp_more_chunks(ODR o, unsigned char *base, int len)
+int odp_more_chunks(ODR o, unsigned char *base, int len)
 {
     if (!len)
     	return 0;
@@ -33,14 +48,44 @@ int MDF odp_more_chunks(ODR o, unsigned char *base, int len)
         return o->bp - base < len;
 }
 
-Odr_oid MDF *odr_oiddup(ODR odr, Odr_oid *o)
+Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
 {
     Odr_oid *r;
 
     if (!o)
     	return 0;
-    if (!(r = odr_malloc(odr, (oid_oidlen(o) + 1) * sizeof(int))))
+    if (!(r = nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
     	return 0;
     oid_oidcpy(r, o);
     return r;
 }
+
+Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
+{
+    return odr_oiddup_nmem (odr->mem, o);
+}
+
+Odr_oid *odr_getoidbystr_nmem(NMEM nmem, char *str)
+{
+    int num = 1, i = 0;
+    char *p = str;
+    Odr_oid *ret;
+
+    if (!isdigit(*str))
+	return 0;
+    while ((p = strchr(p, '.')))
+	num++, p++;
+    ret = nmem_malloc(nmem, sizeof(*ret)*(num + 1));
+    p = str;
+    do
+	ret[i++] = atoi(p);
+    while ((p = strchr(p, '.')) && ++p);
+    ret[i] = -1;
+    return ret;
+}
+
+Odr_oid *odr_getoidbystr(ODR o, char *str)
+{
+    return odr_getoidbystr_nmem (o->mem, str);
+}
+