X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fodr_util.c;h=b42ee79302f3eb466e5af72adb80f6e1a292a2ad;hb=3b792849c676d96918850e2f1e0af87a75278501;hp=c28c586c96b62c01a7cd156b78a4a38e63408b40;hpb=be821514c869d68186361b5aab6bbfd1aa60e087;p=yaz-moved-to-github.git diff --git a/src/odr_util.c b/src/odr_util.c index c28c586..b42ee79 100644 --- 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. * - * $Id: odr_util.c,v 1.12 2007-04-12 20:47:28 adam Exp $ + * $Id: odr_util.c,v 1.13 2007-05-08 08:22:36 adam Exp $ */ /** * \file odr_util.c @@ -50,7 +50,8 @@ Odr_oid *odr_oiddup_nmem(NMEM nmem, const Odr_oid *o) 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; @@ -63,12 +64,12 @@ Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o) Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str) { - int oid[OID_SIZE]; - int *ret; + Odr_oid oid[OID_SIZE]; + Odr_oid *ret; if (oid_dotstring_to_oid(str, oid)) return 0; - ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1)); + ret = (Odr_oid *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1)); oid_oidcpy(ret, oid); return ret; }