From 3086ac94e6343d6ddafb22720fca26d4fc779e1b Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Tue, 3 Apr 2012 06:25:07 +0000 Subject: [PATCH] * Source/NSXMLElement.m, * Source/NSXMLNode.m: Fix compiler error and warning for older version of libxml2. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35024 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/NSXMLElement.m | 2 +- Source/NSXMLNode.m | 11 +++++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d01a721e..442c0609f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-04-03 Fred Kiefer + + * Source/NSXMLElement.m, + * Source/NSXMLNode.m: Fix compiler error and warning for older + version of libxml2. + 2012-04-01 Niels Grewe * Source/NSNumber.m: Add special small object class for floats. diff --git a/Source/NSXMLElement.m b/Source/NSXMLElement.m index 69d94c30b..6d91f0c43 100644 --- a/Source/NSXMLElement.m +++ b/Source/NSXMLElement.m @@ -309,7 +309,7 @@ extern void ensure_oldNs(xmlNodePtr node); xmlDOMWrapAdoptNode(NULL, attr->doc, (xmlNodePtr)attr, node->doc, node, 0); #else - xmlSetTreeDoc((xmlNodePtr)aattr, node->doc); + xmlSetTreeDoc((xmlNodePtr)attr, node->doc); #endif xmlFreeDoc(tmp); diff --git a/Source/NSXMLNode.m b/Source/NSXMLNode.m index c461a50ee..74b13cb17 100644 --- a/Source/NSXMLNode.m +++ b/Source/NSXMLNode.m @@ -1980,7 +1980,6 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants, xmlBufferPtr buffer; int error = 0; int len = 0; - xmlSaveCtxtPtr ctxt; int xmlOptions = 0; buffer = xmlBufferCreate(); @@ -2010,9 +2009,13 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants, #endif #if LIBXML_VERSION >= 20623 - ctxt = xmlSaveToBuffer(buffer, "utf-8", xmlOptions); - xmlSaveTree(ctxt, internal->node); - error = xmlSaveClose(ctxt); + { + xmlSaveCtxtPtr ctxt; + + ctxt = xmlSaveToBuffer(buffer, "utf-8", xmlOptions); + xmlSaveTree(ctxt, internal->node); + error = xmlSaveClose(ctxt); + } #else { xmlDocPtr doc = NULL;