Commit e8f8d751 authored by Kasimier T. Buchcik's avatar Kasimier T. Buchcik
Browse files

Fixed some bugs xmlDOMWrapReconcileNamespaces() wrt the previous addition

* tree.c: Fixed some bugs xmlDOMWrapReconcileNamespaces() wrt
  the previous addition of the removal of redundant ns-decls.
parent e01b2fd7
Thu Feb 2 13:11:26 CET 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
* tree.c: Fixed some bugs xmlDOMWrapReconcileNamespaces() wrt
the previous addition of the removal of redundant ns-decls.
Wed Feb 1 17:32:25 CET 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
 
* tree.c: Enhanced xmlDOMWrapReconcileNamespaces() to remove
......
......@@ -8123,7 +8123,8 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
*/
if (cur->nsDef != NULL) {
prevns = NULL;
for (ns = cur->nsDef; ns != NULL; ns = ns->next) {
ns = cur->nsDef;
while (ns != NULL) {
if (! parnsdone) {
if ((elem->parent) &&
((xmlNodePtr) elem->parent->doc != elem->parent)) {
......@@ -8160,12 +8161,12 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
goto internal_error;
/*
* Remove the ns-decl from the element-node.
*/
*/
if (prevns)
prevns->next = ns->next;
else
cur->nsDef = ns->next;
goto adopt_ns;
cur->nsDef = ns->next;
goto next_ns_decl;
}
}
}
......@@ -8195,14 +8196,15 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
*/
if (xmlDOMWrapNSNormAddNsMapItem(&nsMap, &topmi, ns, ns,
depth) == NULL)
goto internal_error;
goto internal_error;
prevns = ns;
next_ns_decl:
ns = ns->next;
}
}
if (! adoptns)
goto ns_end;
adopt_ns:
/* No break on purpose. */
case XML_ATTRIBUTE_NODE:
/* No ns, no fun. */
......@@ -8316,7 +8318,7 @@ next_sibling:
internal_error:
ret = -1;
exit:
if (listRedund) {
if (listRedund) {
for (i = 0, j = 0; i < nbRedund; i++, j += 2) {
xmlFreeNs(listRedund[j]);
}
......
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