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
Make wrbuf_put_zquery public
[yaz-moved-to-github.git]
/
src
/
odr_util.c
diff --git
a/src/odr_util.c
b/src/odr_util.c
index
6beac3b
..
a433c35
100644
(file)
--- a/
src/odr_util.c
+++ b/
src/odr_util.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: odr_util.c,v 1.7 2005-01-15 19:47:14 adam Exp $
+ * $Id: odr_util.c,v 1.8 2005-06-25 15:46:04 adam Exp $
*/
/**
* \file odr_util.c
*/
/**
* \file odr_util.c
@@
-21,24
+21,24
@@
void odr_prname(ODR o, const char *name)
{
if (name)
void odr_prname(ODR o, const char *name)
{
if (name)
- odr_printf(o, "%*s%s ", o->indent*4, "", name);
+ odr_printf(o, "%*s%s ", o->indent*4, "", name);
else
else
- odr_printf(o, "%*s", o->indent*4, "");
+ odr_printf(o, "%*s", o->indent*4, "");
}
int odp_more_chunks(ODR o, const unsigned char *base, int len)
{
if (!len)
}
int odp_more_chunks(ODR o, const unsigned char *base, int len)
{
if (!len)
- return 0;
+ return 0;
if (len < 0) /* indefinite length */
{
if (len < 0) /* indefinite length */
{
- if (*o->bp == 0 && *(o->bp + 1) == 0)
- {
- o->bp += 2;
- return 0;
- }
- else
- return 1;
+ if (*o->bp == 0 && *(o->bp + 1) == 0)
+ {
+ o->bp += 2;
+ return 0;
+ }
+ else
+ return 1;
}
else
return o->bp - base < len;
}
else
return o->bp - base < len;
@@
-49,9
+49,9
@@
Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
Odr_oid *r;
if (!o)
Odr_oid *r;
if (!o)
- return 0;
+ return 0;
if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
- return 0;
+ return 0;
oid_oidcpy(r, o);
return r;
}
oid_oidcpy(r, o);
return r;
}
@@
-59,7
+59,7
@@
Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
{
if (!odr->mem)
Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
{
if (!odr->mem)
- odr->mem = nmem_create();
+ odr->mem = nmem_create();
return odr_oiddup_nmem (odr->mem, o);
}
return odr_oiddup_nmem (odr->mem, o);
}
@@
-70,13
+70,13
@@
Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
Odr_oid *ret;
if (!isdigit(*(const unsigned char *) str))
Odr_oid *ret;
if (!isdigit(*(const unsigned char *) str))
- return 0;
+ return 0;
while ((p = strchr(p, '.')))
while ((p = strchr(p, '.')))
- num++, p++;
+ num++, p++;
ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(num + 1));
p = str;
do
ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(num + 1));
p = str;
do
- ret[i++] = atoi(p);
+ ret[i++] = atoi(p);
while ((p = strchr(p, '.')) && *++p);
ret[i] = -1;
return ret;
while ((p = strchr(p, '.')) && *++p);
ret[i] = -1;
return ret;
@@
-85,7
+85,7
@@
Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
Odr_oid *odr_getoidbystr(ODR o, const char *str)
{
if (!o->mem)
Odr_oid *odr_getoidbystr(ODR o, const char *str)
{
if (!o->mem)
- o->mem = nmem_create();
+ o->mem = nmem_create();
return odr_getoidbystr_nmem (o->mem, str);
}
return odr_getoidbystr_nmem (o->mem, str);
}
@@
-107,8
+107,8
@@
int odr_missing(ODR o, int opt, const char *name)
* any) and a separator character. Copy `prefix', a forward slash and
* the old value into the new area and return its address. Can be
* used as follows:
* any) and a separator character. Copy `prefix', a forward slash and
* the old value into the new area and return its address. Can be
* used as follows:
- * initRequest->implementationName = odr_prepend(o,
- * initRequest->implementationName, "ZOOM-C");
+ * initRequest->implementationName = odr_prepend(o,
+ * initRequest->implementationName, "ZOOM-C");
*/
char *odr_prepend(ODR o, const char *prefix, const char *old)
{
*/
char *odr_prepend(ODR o, const char *prefix, const char *old)
{
@@
-118,11
+118,19
@@
char *odr_prepend(ODR o, const char *prefix, const char *old)
*res = '\0';
if (prefix != 0)
*res = '\0';
if (prefix != 0)
- strcpy (res, prefix);
+ strcpy (res, prefix);
if (prefix != 0 && old != 0)
if (prefix != 0 && old != 0)
- strcat (res, "/");
+ strcat (res, "/");
if (old !=0)
if (old !=0)
- strcat (res, old);
+ strcat (res, old);
return res;
}
return res;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+