diff options
| author | sr | 2012-09-05 18:09:28 +0200 |
|---|---|---|
| committer | sr | 2012-09-05 18:09:28 +0200 |
| commit | 8cb2c797934d717538b3dd585c3759c04131a4ad (patch) | |
| tree | d7d5d2297d0fa2634cdbe510cec474f501b1b486 /src/server/xmlutil.c | |
| parent | [SERVER] More work towards automatic server discovery and querying (diff) | |
| download | dnbd3-8cb2c797934d717538b3dd585c3759c04131a4ad.tar.gz dnbd3-8cb2c797934d717538b3dd585c3759c04131a4ad.tar.xz dnbd3-8cb2c797934d717538b3dd585c3759c04131a4ad.zip | |
[SERVER] Automatically add and remove alt servers from images depending on wehter the other server is reachable
[SERVER] Automatically replicate images from other servers
Diffstat (limited to 'src/server/xmlutil.c')
| -rw-r--r-- | src/server/xmlutil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/xmlutil.c b/src/server/xmlutil.c index 62736cd..1718bfb 100644 --- a/src/server/xmlutil.c +++ b/src/server/xmlutil.c @@ -3,7 +3,7 @@ #include <libxml/xpath.h> -xmlChar *getTextFromPath(xmlDocPtr doc, char *xpath) +char *getTextFromPath(xmlDocPtr doc, char *xpath) { xmlXPathContextPtr xpathCtx = xmlXPathNewContext(doc); if (xpathCtx == NULL) @@ -14,12 +14,12 @@ xmlChar *getTextFromPath(xmlDocPtr doc, char *xpath) xmlXPathFreeContext(xpathCtx); return NULL; } - xmlChar *retval = NULL; + char *retval = NULL; if (xpathObj->stringval) - retval = xmlStrdup(xpathObj->stringval); + retval = (char*)xmlStrdup(xpathObj->stringval); else if (xpathObj->nodesetval && xpathObj->nodesetval->nodeNr > 0 && xpathObj->nodesetval->nodeTab && xpathObj->nodesetval->nodeTab[0]) { - retval = xmlNodeGetContent(xpathObj->nodesetval->nodeTab[0]); + retval = (char*)xmlNodeGetContent(xpathObj->nodesetval->nodeTab[0]); } xmlXPathFreeObject(xpathObj); xmlXPathFreeContext(xpathCtx); |