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
Fixed bug #1338: GFS crashes when startRecord > number of hits.
[yaz-moved-to-github.git]
/
src
/
odr_util.c
diff --git
a/src/odr_util.c
b/src/odr_util.c
index
c50ac55
..
b42ee79
100644
(file)
--- a/
src/odr_util.c
+++ b/
src/odr_util.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: odr_util.c,v 1.11 2007-04-12 13:52:57 adam Exp $
+ * $Id: odr_util.c,v 1.13 2007-05-08 08:22:36 adam Exp $
*/
/**
* \file odr_util.c
*/
/**
* \file odr_util.c
@@
-50,7
+50,8
@@
Odr_oid *odr_oiddup_nmem(NMEM nmem, const Odr_oid *o)
if (!o)
return 0;
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;
return 0;
oid_oidcpy(r, o);
return r;
@@
-63,20
+64,13
@@
Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o)
Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
{
Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
{
- int num = 1, i = 0;
- const char *p = str;
+ Odr_oid oid[OID_SIZE];
Odr_oid *ret;
Odr_oid *ret;
- if (!isdigit(*(const unsigned char *) str))
+ if (oid_dotstring_to_oid(str, oid))
return 0;
return 0;
- while ((p = strchr(p, '.')))
- num++, p++;
- ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(num + 1));
- p = str;
- do
- ret[i++] = atoi(p);
- while ((p = strchr(p, '.')) && *++p);
- ret[i] = -1;
+ ret = (Odr_oid *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
+ oid_oidcpy(ret, oid);
return ret;
}
return ret;
}