CCL: slight reformat

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

diff --git a/src/odr_util.c b/src/odr_util.c
index a433c35..3959106 100644 (file)
--- a/src/odr_util.c
+++ b/src/odr_util.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_util.c,v 1.8 2005-06-25 15:46:04 adam Exp $
  */
 /**
  * \file odr_util.c
@@ -14,79 +12,71 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include "odr-priv.h"
-#include <yaz/oid.h>
+#include <yaz/oid_util.h>
 
 void odr_prname(ODR o, const char *name)
 {
-    if (name)
-        odr_printf(o, "%*s%s ", o->indent*4, "", name);
+    if (o->op->indent < 16)
+        odr_printf(o, "%*s", o->op->indent * 2, "");
     else
-        odr_printf(o, "%*s", o->indent*4, "");
+        odr_printf(o, "level=%-7d%*s", o->op->indent,
+                   2 * (o->op->indent % 8) , "");
+    if (name)
+        odr_printf(o, "%s ", name);
 }
 
-int odp_more_chunks(ODR o, const unsigned char *base, int len)
+int odp_more_chunks(ODR o, const char *base, int len)
 {
     if (!len)
         return 0;
     if (len < 0) /* indefinite length */
     {
-        if (*o->bp == 0 && *(o->bp + 1) == 0)
+        if (*o->op->bp == 0 && *(o->op->bp + 1) == 0)
         {
-            o->bp += 2;
+            o->op->bp += 2;
             return 0;
         }
         else
             return 1;
     }
     else
-        return o->bp - base < len;
+        return o->op->bp - base < len;
 }
 
-Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
+Odr_oid *odr_oiddup_nmem(NMEM nmem, const Odr_oid *o)
 {
     Odr_oid *r;
 
     if (!o)
         return 0;
-    if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
+    if (!(r = (Odr_oid *)
+          nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(Odr_oid))))
         return 0;
     oid_oidcpy(r, o);
     return r;
 }
 
-Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
+Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o)
 {
-    if (!odr->mem)
-        odr->mem = nmem_create();
-    return odr_oiddup_nmem (odr->mem, o);
+    return odr_oiddup_nmem(odr_getmem(odr), o);
 }
 
 Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
 {
-    int num = 1, i = 0;
-    const char *p = str;
+    Odr_oid oid[OID_SIZE];
     Odr_oid *ret;
 
-    if (!isdigit(*(const unsigned char *) str))
+    if (oid_dotstring_to_oid(str, oid))
         return 0;
-    while ((p = strchr(p, '.')))
-        num++, p++;
-    ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(num + 1));
-    p = str;
-    do
-        ret[i++] = atoi(p);
-    while ((p = strchr(p, '.')) && *++p);
-    ret[i] = -1;
+    ret = (Odr_oid *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
+    oid_oidcpy(ret, oid);
     return ret;
 }
 
 Odr_oid *odr_getoidbystr(ODR o, const char *str)
 {
-    if (!o->mem)
-        o->mem = nmem_create();
-    return odr_getoidbystr_nmem (o->mem, str);
+    return odr_getoidbystr_nmem(odr_getmem(o), str);
 }
 
 int odr_missing(ODR o, int opt, const char *name)
@@ -117,18 +107,18 @@ char *odr_prepend(ODR o, const char *prefix, const char *old)
     char *res = (char*) odr_malloc (o, olen + plen + 2);
 
     *res = '\0';
-    if (prefix != 0)
-        strcpy (res, prefix);
-    if (prefix != 0 && old != 0)
-        strcat (res, "/");
-    if (old !=0)
-        strcat (res, old);
-
+    if (plen > 0)
+        strcpy(res, prefix);
+    if (plen > 0 && old != 0)
+        strcat(res, "/");
+    if (old != 0)
+        strcat(res, old);
     return res;
 }
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab