Commit e6a5519c authored by Daniel Veillard's avatar Daniel Veillard
Browse files

some cleanup after an unsuccessful attempt at fixing #61290 :-( Daniel

* debugXML.c tree.c: some cleanup after an unsuccessful attempt
  at fixing #61290 :-(
Daniel
parent bc66f859
Mon Jan 14 17:53:41 CET 2002 Daniel Veillard <daniel@veillard.com>
* debugXML.c tree.c: some cleanup after an unsuccessful attempt
at fixing #61290 :-(
Sun Jan 13 21:30:54 CET 2002 Daniel Veillard <daniel@veillard.com>
* tree.c: fixed xmlSaveFormatFileEnc() when encoding == NULL
......
......@@ -1111,17 +1111,22 @@ xmlLsOneNode(FILE *output, xmlNodePtr node) {
case XML_NOTATION_NODE:
fprintf(output, "N");
break;
case XML_NAMESPACE_DECL:
fprintf(output, "n");
break;
default:
fprintf(output, "?");
}
if (node->properties != NULL)
fprintf(output, "a");
else
fprintf(output, "-");
if (node->nsDef != NULL)
fprintf(output, "n");
else
fprintf(output, "-");
if (node->type != XML_NAMESPACE_DECL) {
if (node->properties != NULL)
fprintf(output, "a");
else
fprintf(output, "-");
if (node->nsDef != NULL)
fprintf(output, "n");
else
fprintf(output, "-");
}
fprintf(output, " %8d ", xmlLsCountNode(node));
......@@ -1169,6 +1174,15 @@ xmlLsOneNode(FILE *output, xmlNodePtr node) {
break;
case XML_NOTATION_NODE:
break;
case XML_NAMESPACE_DECL: {
xmlNsPtr ns = (xmlNsPtr) node;
if (ns->prefix == NULL)
fprintf(output, "default -> %s", ns->href);
else
fprintf(output, "%s -> %s", ns->prefix, ns->href);
break;
}
default:
if (node->name != NULL)
fprintf(output, "%s", node->name);
......@@ -1363,6 +1377,9 @@ xmlShellList(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED,
if ((node->type == XML_DOCUMENT_NODE) ||
(node->type == XML_HTML_DOCUMENT_NODE)) {
cur = ((xmlDocPtr) node)->children;
} else if (node->type == XML_NAMESPACE_DECL) {
xmlLsOneNode(stdout, node);
return (0);
} else if (node->children != NULL) {
cur = node->children;
} else {
......
......@@ -2352,6 +2352,10 @@ xmlFreeNodeList(xmlNodePtr cur) {
#endif
return;
}
if (cur->type == XML_NAMESPACE_DECL) {
xmlFreeNsList((xmlNsPtr) cur);
return;
}
while (cur != NULL) {
next = cur->next;
/* unroll to speed up freeing the document */
......@@ -2425,8 +2429,14 @@ xmlFreeNode(xmlNodePtr cur) {
return;
}
/* use xmlFreeDtd for DTD nodes */
if (cur->type == XML_DTD_NODE)
if (cur->type == XML_DTD_NODE) {
xmlFreeDtd((xmlDtdPtr) cur);
return;
}
if (cur->type == XML_NAMESPACE_DECL) {
xmlFreeNs((xmlNsPtr) cur);
return;
}
if ((cur->children != NULL) &&
(cur->type != XML_ENTITY_REF_NODE))
xmlFreeNodeList(cur->children);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment