Merge branch 'master' into sru_2_0

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

diff --git a/src/odr_util.c b/src/odr_util.c
index 58b60cb..a5c64d6 100644 (file)
--- 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-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -26,7 +26,7 @@ void odr_prname(ODR o, const char *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;
@@ -108,12 +108,11 @@ char *odr_prepend(ODR o, const char *prefix, const char *old)
 
     *res = '\0';
     if (plen > 0)
-        strcpy (res, prefix);
+        strcpy(res, prefix);
     if (plen > 0 && old != 0)
-        strcat (res, "/");
-    if (old !=0)
-        strcat (res, old);
-
+        strcat(res, "/");
+    if (old != 0)
+        strcat(res, old);
     return res;
 }
 /*