-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
- *
- * $Id: nmemsdup.c,v 1.6 2006-05-02 20:47:45 adam Exp $
*/
/**
#endif
#include <string.h>
-#include <yaz/nmem.h>
-#if HAVE_XML2
-#include <libxml/tree.h>
-#endif
+#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)
+{
+ 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)
{
- int *dst = (int*) nmem_malloc (mem, sizeof(int));
+ nmem_bool_t *dst = (nmem_bool_t*) nmem_malloc (mem, sizeof(*dst));
*dst = v;
return dst;
}
else
{
size_t i = 0;
- *darray = nmem_malloc(nmem, *num * sizeof(**darray));
+ *darray = (char **) nmem_malloc(nmem, *num * sizeof(**darray));
for (cp = dstr; *cp; )
{
const char *cp0;
}
}
-#if HAVE_XML2
-char *nmem_text_node_cdata(const void *ptr_cdata, NMEM nmem)
+#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 = (const xmlNode *) ptr_cdata; ptr; ptr = ptr->next)
+ 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 = (const xmlNode *) ptr_cdata; ptr; ptr = ptr->next)
+ for (ptr = ptr_cdata; ptr; ptr = ptr->next)
if (ptr->type == XML_TEXT_NODE)
strcat(cdata, (const char *) ptr->content);
return cdata;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab