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

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index 2c8e7d8..f27f814 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-2010 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);
@@ -32,9 +38,16 @@ char *nmem_strdupn (NMEM mem, const char *src, size_t n)
     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;
 }
@@ -62,7 +75,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,9 +91,29 @@ 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
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab