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
Minor changes for project.
[yaz-moved-to-github.git]
/
odr
/
odr_util.c
diff --git
a/odr/odr_util.c
b/odr/odr_util.c
index
0cee539
..
e8856e6
100644
(file)
--- a/
odr/odr_util.c
+++ b/
odr/odr_util.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-1998, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_util.c,v $
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_util.c,v $
- * Revision 1.12 1997-10-31 12:20:08 adam
+ * Revision 1.14 1998-10-13 15:58:36 adam
+ * Minor fix in odr_getoidbystr_nmem.
+ *
+ * Revision 1.13 1998/02/11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.12 1997/10/31 12:20:08 adam
* Improved memory debugging for xmalloc/nmem.c. References to NMEM
* instead of ODR in n ESPEC-1 handling in source d1_espec.c.
* Bug fix: missing fclose in data1_read_espec1.
* Improved memory debugging for xmalloc/nmem.c. References to NMEM
* instead of ODR in n ESPEC-1 handling in source d1_espec.c.
* Bug fix: missing fclose in data1_read_espec1.
@@
-54,7
+60,7
@@
Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
if (!o)
return 0;
if (!o)
return 0;
- if (!(r = nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
+ if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
return 0;
oid_oidcpy(r, o);
return r;
return 0;
oid_oidcpy(r, o);
return r;
@@
-75,11
+81,11
@@
Odr_oid *odr_getoidbystr_nmem(NMEM nmem, char *str)
return 0;
while ((p = strchr(p, '.')))
num++, p++;
return 0;
while ((p = strchr(p, '.')))
num++, p++;
- ret = nmem_malloc(nmem, sizeof(*ret)*(num + 1));
+ ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(num + 1));
p = str;
do
ret[i++] = atoi(p);
p = str;
do
ret[i++] = atoi(p);
- while ((p = strchr(p, '.')) && ++p);
+ while ((p = strchr(p, '.')) && *++p);
ret[i] = -1;
return ret;
}
ret[i] = -1;
return ret;
}