-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
- *
- * $Id: nmemsdup.c,v 1.5 2005-06-25 15:46:04 adam Exp $
*/
/**
#endif
#include <string.h>
-#include <yaz/nmem.h>
+#include <yaz/nmem_xml.h>
char *nmem_strdup (NMEM mem, const char *src)
{
return dst;
}
+char *nmem_strdup_null(NMEM mem, const char *src)
+{
+ if (!src)
+ return 0;
+ else
+ return nmem_strdup(mem, src);
+}
+
char *nmem_strdupn (NMEM mem, const char *src, size_t n)
{
char *dst = (char *)nmem_malloc (mem, n+1);
return dst;
}
-int *nmem_intdup(NMEM mem, int v)
+nmem_int_t *nmem_intdup(NMEM mem, nmem_int_t v)
{
- int *dst = (int*) nmem_malloc (mem, sizeof(int));
+ nmem_int_t *dst = (nmem_int_t*) nmem_malloc (mem, sizeof(*dst));
+ *dst = v;
+ return dst;
+}
+
+nmem_bool_t *nmem_booldup(NMEM mem, nmem_bool_t v)
+{
+ nmem_bool_t *dst = (nmem_bool_t*) nmem_malloc (mem, sizeof(*dst));
*dst = v;
return dst;
}
nmem_strsplit(nmem, " ", dstr, darray, num);
}
+
void nmem_strsplit(NMEM nmem, const char *delim, const char *dstr,
char ***darray, int *num)
{
+ nmem_strsplitx(nmem, delim, dstr, darray, num, 1);
+}
+
+void nmem_strsplitx(NMEM nmem, const char *delim, const char *dstr,
+ char ***darray, int *num, int collapse)
+{
const char *cp = dstr;
- for (*num = 0; *cp; (*num)++)
+ *num = 0;
+
+ while (1)
{
- while (*cp && strchr(delim, *cp))
- cp++;
- if (!*cp)
- break;
- while (*cp && !strchr(delim, *cp))
+ if (collapse)
+ {
+ if (!*cp)
+ break;
+ while (*cp && strchr(delim, *cp))
+ cp++;
+ if (!*cp)
+ break;
+ while (*cp && !strchr(delim, *cp))
+ cp++;
+ (*num)++;
+ }
+ else
+ {
+ (*num)++;
+ while (*cp && !strchr(delim, *cp))
+ cp++;
+ if (!*cp)
+ break;
cp++;
+ }
}
if (!*num)
*darray = 0;
else
{
size_t i = 0;
- *darray = nmem_malloc(nmem, *num * sizeof(**darray));
- for (cp = dstr; *cp; )
+ *darray = (char **) nmem_malloc(nmem, *num * sizeof(**darray));
+ cp = dstr;
+ while (1)
{
const char *cp0;
- while (*cp && strchr(delim, *cp))
- cp++;
- if (!*cp)
- break;
- cp0 = cp;
- while (*cp && !strchr(delim, *cp))
+ if (collapse)
+ {
+ if (!*cp)
+ break;
+ while (*cp && strchr(delim, *cp))
+ cp++;
+ if (!*cp)
+ break;
+ cp0 = cp;
+ while (*cp && !strchr(delim, *cp))
+ cp++;
+ (*darray)[i++] = nmem_strdupn(nmem, cp0, cp - cp0);
+ }
+ else
+ {
+ cp0 = cp;
+ while (*cp && !strchr(delim, *cp))
+ cp++;
+ (*darray)[i++] = nmem_strdupn(nmem, cp0, cp - cp0);
+ if (!*cp)
+ break;
cp++;
- (*darray)[i++] = nmem_strdupn(nmem, cp0, cp - cp0);
+ }
}
}
}
+#if YAZ_HAVE_XML2
+char *nmem_text_node_cdata(const xmlNode *ptr_cdata, NMEM nmem)
+{
+ char *cdata;
+ int len = 0;
+ const xmlNode *ptr;
+
+ for (ptr = ptr_cdata; ptr; ptr = ptr->next)
+ if (ptr->type == XML_TEXT_NODE)
+ len += xmlStrlen(ptr->content);
+ cdata = (char *) nmem_malloc(nmem, len+1);
+ *cdata = '\0';
+ for (ptr = ptr_cdata; ptr; ptr = ptr->next)
+ if (ptr->type == XML_TEXT_NODE)
+ strcat(cdata, (const char *) ptr->content);
+ return cdata;
+}
+#endif
+
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab