X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fnmemsdup.c;h=0fe7373d6064f5baacf922d89a992086255577c2;hb=2ba84b155219d5d18eed5ba4d929c12abdb88f14;hp=2c8e7d878d46f9beee62167c42bcd60a70b80b63;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index 2c8e7d8..0fe7373 100644
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: nmemsdup.c,v 1.5 2005-06-25 15:46:04 adam Exp $
  */
 
 /**
@@ -15,7 +13,7 @@
 #endif
 
 #include <string.h>
-#include <yaz/nmem.h>
+#include <yaz/nmem_xml.h>
 
 char *nmem_strdup (NMEM mem, const char *src)
 {
@@ -24,6 +22,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);
@@ -62,7 +68,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;
@@ -78,6 +84,25 @@ void nmem_strsplit(NMEM nmem, const char *delim, const char *dstr,
     }
 }
 
+#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