X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fnmemsdup.c;h=95f182c461d9b45c3e40b6d6cfcc7f2d426ce89b;hb=3b792849c676d96918850e2f1e0af87a75278501;hp=2c537f6d3c061d166e98b55dd5da14bcea53f356;hpb=a0e27aac0589d493172c73f6660b844fc6460d7c;p=yaz-moved-to-github.git

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index 2c537f6..95f182c 100644
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: nmemsdup.c,v 1.6 2006-05-02 20:47:45 adam Exp $
+ * $Id: nmemsdup.c,v 1.11 2007-05-06 20:12:20 adam Exp $
  */
 
 /**
@@ -15,10 +15,7 @@
 #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)
 {
@@ -27,6 +24,14 @@ 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);
@@ -65,7 +70,7 @@ void nmem_strsplit(NMEM nmem, const char *delim, const char *dstr,
     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;
@@ -81,19 +86,19 @@ void nmem_strsplit(NMEM nmem, const char *delim, const char *dstr,
     }
 }
 
-#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;