-/*
- * Copyright (c) 1995-2003, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
- *
- * $Id: odr_util.c,v 1.1 2003-10-27 12:21:34 adam Exp $
+ */
+/**
+ * \file odr_util.c
+ * \brief Implements various ODR utilities
*/
#if HAVE_CONFIG_H
#include <config.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include "odr-priv.h"
-#include <yaz/oid.h>
+#include <yaz/oid_util.h>
void odr_prname(ODR o, const char *name)
{
if (name)
- fprintf (o->print, "%*s%s ", o->indent*4, "", name);
+ odr_printf(o, "%*s%s ", o->op->indent*4, "", name);
else
- fprintf (o->print, "%*s", o->indent*4, "");
+ odr_printf(o, "%*s", o->op->indent*4, "");
}
int odp_more_chunks(ODR o, const unsigned char *base, int len)
{
if (!len)
- return 0;
+ return 0;
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;
}
-Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
+Odr_oid *odr_oiddup_nmem(NMEM nmem, const Odr_oid *o)
{
Odr_oid *r;
if (!o)
- return 0;
- if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
- return 0;
+ return 0;
+ 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_oiddup(ODR odr, Odr_oid *o)
+Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o)
{
- return odr_oiddup_nmem (odr->mem, o);
+ return odr_oiddup_nmem(odr_getmem(odr), o);
}
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(*str))
- 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;
+ if (oid_dotstring_to_oid(str, oid))
+ return 0;
+ ret = (Odr_oid *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
+ oid_oidcpy(ret, oid);
return ret;
}
Odr_oid *odr_getoidbystr(ODR o, const char *str)
{
- return odr_getoidbystr_nmem (o->mem, str);
+ return odr_getoidbystr_nmem(odr_getmem(o), str);
}
int odr_missing(ODR o, int opt, const char *name)
}
return opt;
}
+
+/*
+ * Reallocate the buffer `old', using the ODR memory pool `o' to be
+ * big enough to hold its existing value (if any) plus `prefix' (if
+ * 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");
+ */
+char *odr_prepend(ODR o, const char *prefix, const char *old)
+{
+ int plen = (prefix == 0) ? 0 : strlen(prefix);
+ int olen = (old == 0) ? 0 : strlen(old);
+ char *res = (char*) odr_malloc (o, olen + plen + 2);
+
+ *res = '\0';
+ if (prefix != 0)
+ strcpy (res, prefix);
+ if (prefix != 0 && old != 0)
+ strcat (res, "/");
+ if (old !=0)
+ strcat (res, old);
+
+ return res;
+}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+