gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 17:12:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSXMLElement.m,

Browse source 
* 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
This commit is contained in:
Fred Kiefer 2012-04-03 06:25:07 +00:00
parent 490dfca739
commit 3086ac94e6
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-04-03 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLElement.m,
* Source/NSXMLNode.m: Fix compiler error and warning for older
version of libxml2.
2012-04-01 Niels Grewe <niels.grewe@halbordnung.de> 2012-04-01 Niels Grewe <niels.grewe@halbordnung.de>
* Source/NSNumber.m: Add special small object class for floats. * Source/NSNumber.m: Add special small object class for floats.

2
Source/NSXMLElement.m
View file

@ -309,7 +309,7 @@ extern void ensure_oldNs(xmlNodePtr node);
xmlDOMWrapAdoptNode(NULL, attr->doc, (xmlNodePtr)attr, xmlDOMWrapAdoptNode(NULL, attr->doc, (xmlNodePtr)attr,
node->doc, node, 0); node->doc, node, 0);
#else #else
xmlSetTreeDoc((xmlNodePtr)aattr, node->doc); xmlSetTreeDoc((xmlNodePtr)attr, node->doc);
#endif #endif
xmlFreeDoc(tmp); xmlFreeDoc(tmp);

11
Source/NSXMLNode.m
View file

@ -1980,7 +1980,6 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
xmlBufferPtr buffer; xmlBufferPtr buffer;
int error = 0; int error = 0;
int len = 0; int len = 0;
xmlSaveCtxtPtr ctxt;
int xmlOptions = 0; int xmlOptions = 0;
buffer = xmlBufferCreate(); buffer = xmlBufferCreate();
@ -2010,9 +2009,13 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
#endif #endif
#if LIBXML_VERSION >= 20623 #if LIBXML_VERSION >= 20623
ctxt = xmlSaveToBuffer(buffer, "utf-8", xmlOptions); {
xmlSaveTree(ctxt, internal->node); xmlSaveCtxtPtr ctxt;
error = xmlSaveClose(ctxt);
ctxt = xmlSaveToBuffer(buffer, "utf-8", xmlOptions);
xmlSaveTree(ctxt, internal->node);
error = xmlSaveClose(ctxt);
}
#else #else
{ {
xmlDocPtr doc = NULL; xmlDocPtr doc = NULL;