projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 2 check
[yaz-moved-to-github.git]
/
src
/
odr_util.c
diff --git
a/src/odr_util.c
b/src/odr_util.c
index
644c3c3
..
6efa6c0
100644
(file)
--- a/
src/odr_util.c
+++ b/
src/odr_util.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* 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.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-20,7
+20,7
@@
void odr_prname(ODR o, const char *name)
if (o->op->indent < 16)
odr_printf(o, "%*s", o->op->indent * 2, "");
else
if (o->op->indent < 16)
odr_printf(o, "%*s", o->op->indent * 2, "");
else
- odr_printf(o, "level=%-7d%*s", o->op->indent,
+ odr_printf(o, "level=%-7d%*s", o->op->indent,
2 * (o->op->indent % 8) , "");
if (name)
odr_printf(o, "%s ", name);
2 * (o->op->indent % 8) , "");
if (name)
odr_printf(o, "%s ", name);
@@
-107,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';
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;
}
/*
return res;
}
/*