X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fnmemsdup.c;h=016676c2a18eeeb7621f9a49d630fe4627e28aca;hb=db93359f0cbf9a1e9dc81ea05f7b8662f843ae3d;hp=7b2a051737eef015c067130cde418d2ca8648deb;hpb=e70cbdfde382dd605d58fc112cc2458cfce37382;p=yaz-moved-to-github.git diff --git a/src/nmemsdup.c b/src/nmemsdup.c index 7b2a051..016676c 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.7 2006-05-03 13:04:46 adam Exp $ + * $Id: nmemsdup.c,v 1.10 2007-01-03 08:42:15 adam Exp $ */ /** @@ -16,7 +16,7 @@ #include #include -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #endif @@ -89,19 +89,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;