-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
- *
- * $Id: odr_util.c,v 1.11 2007-04-12 13:52:57 adam Exp $
*/
/**
* \file odr_util.c
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;
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;
- if (!isdigit(*(const unsigned char *) str))
+ if (oid_dotstring_to_oid(str, oid))
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;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab