X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_util.c;h=39591063d28b3856fb2b41665cb8a1ec04bb34b9;hp=aea6a4ab620dbf3f0976f1615f1d3cd9b953b411;hb=df60350f9737923dce347e59b9c4cafa789ab7aa;hpb=4f3bcae93d51a26709c12b51261c3d95af610cb2

diff --git a/src/odr_util.c b/src/odr_util.c
index aea6a4a..3959106 100644
--- a/src/odr_util.c
+++ b/src/odr_util.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -17,28 +17,31 @@
 
 void odr_prname(ODR o, const char *name)
 {
-    if (name)
-        odr_printf(o, "%*s%s ", o->op->indent*4, "", name);
+    if (o->op->indent < 16)
+        odr_printf(o, "%*s", o->op->indent * 2, "");
     else
-        odr_printf(o, "%*s", o->op->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, const Odr_oid *o)
@@ -104,13 +107,12 @@ 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;
 }
 /*