lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-30 22:43:14 +03:00
Code Activity

some changes related to the new way of handling Result Value Tree, before

Browse Source 
* tree.c xpath.c: some changes related to the new way of
  handling Result Value Tree, before 2.5.5
Daniel
This commit is contained in:
Daniel Veillard
2003-03-24 18:39:54 +00:00
parent d8da01cf37
commit 9adc0469d4
3 changed files with 61 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tree.c
View File

@ -2967,6 +2967,14 @@ xmlFreeNodeList(xmlNodePtr cur) {
xmlFreeNsList((xmlNsPtr) cur);
return;
}
if ((cur->type == XML_DOCUMENT_NODE) ||
#ifdef LIBXML_DOCB_ENABLED
(cur->type == XML_DOCB_DOCUMENT_NODE) ||
(cur->type == XML_HTML_DOCUMENT_NODE)) {
#endif
xmlFreeDoc((xmlDocPtr) cur);
return;
}
while (cur != NULL) {
next = cur->next;
/* unroll to speed up freeing the document */
@ -4592,17 +4600,39 @@ xmlNodeGetContent(xmlNodePtr cur)
return (ret);
}
case XML_ENTITY_NODE:
case XML_DOCUMENT_NODE:
case XML_HTML_DOCUMENT_NODE:
case XML_DOCUMENT_TYPE_NODE:
case XML_NOTATION_NODE:
case XML_DTD_NODE:
case XML_XINCLUDE_START:
case XML_XINCLUDE_END:
return (NULL);
case XML_DOCUMENT_NODE:
#ifdef LIBXML_DOCB_ENABLED
case XML_DOCB_DOCUMENT_NODE:
#endif
return (NULL);
case XML_HTML_DOCUMENT_NODE: {
xmlChar *tmp;
xmlChar *res = NULL;
cur = cur->children;
while (cur!= NULL) {
if ((cur->type == XML_ELEMENT_NODE) ||
(cur->type == XML_TEXT_NODE) ||
(cur->type == XML_CDATA_SECTION_NODE)) {
tmp = xmlNodeGetContent(cur);
if (tmp != NULL) {
if (res == NULL)
res = tmp;
else {
res = xmlStrcat(res, tmp);
xmlFree(tmp);
}
}
}
cur = cur->next;
}
return(res);
}
case XML_NAMESPACE_DECL: {
xmlChar *tmp;