X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fodr_util.c;h=a5c64d670eb4648859ce0c96f40865be1ce3c017;hb=2edd9764942ec2d62cabcb4190a69921c60af293;hp=c28c586c96b62c01a7cd156b78a4a38e63408b40;hpb=be821514c869d68186361b5aab6bbfd1aa60e087;p=yaz-moved-to-github.git

diff --git a/src/odr_util.c b/src/odr_util.c
index c28c586..a5c64d6 100644
--- a/src/odr_util.c
+++ b/src/odr_util.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_util.c,v 1.12 2007-04-12 20:47:28 adam Exp $
  */
 /**
  * \file odr_util.c
@@ -14,19 +12,21 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include "odr-priv.h"
 #include <yaz/oid_util.h>
 
 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;
@@ -50,7 +50,8 @@ Odr_oid *odr_oiddup_nmem(NMEM nmem, const Odr_oid *o)
 
     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;
@@ -63,12 +64,12 @@ Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o)
 
 Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
 {
-    int oid[OID_SIZE];
-    int *ret;
+    Odr_oid oid[OID_SIZE];
+    Odr_oid *ret;
 
     if (oid_dotstring_to_oid(str, oid))
         return 0;
-    ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
+    ret = (Odr_oid *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
     oid_oidcpy(ret, oid);
     return ret;
 }
@@ -106,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