commit 8a1b1853fc9082c6b0905ca2b5442dfa1e839ad2
author Daniel Veillard <veillard@src.gnome.org> Sun Jan 05 22:37:17 2003 +0000
committer Daniel Veillard <veillard@src.gnome.org> Sun Jan 05 22:37:17 2003 +0000
tree 738d84b0be54b8be457342b144c061c31659cd48
parent 067bae5ff8f715ce895e0cecf8c5b4b6b2f5e218

applied patch from Lukas Schroeder for register callbacks modified patch

* tree.c : applied patch from Lukas Schroeder for register callbacks
* valid.c: modified patch from Lukas Schroeder to test
  register callbacks with --chkregister
Daniel

tree.c

diff --git a/tree.c b/tree.c
index bd78564..4134f59 100644
--- a/tree.c
+++ b/tree.c
@@ -447,6 +447,9 @@
 	    }
 	}
     }
+
+    if (xmlRegisterNodeDefaultValue)
+	xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
     return(cur);
 }
 
@@ -1300,6 +1303,9 @@
 	    cur->prev = prev;
 	}
     }
+
+    if (xmlRegisterNodeDefaultValue)
+	xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
     return(cur);
 }
 
@@ -1579,6 +1585,9 @@
     
     cur->name = name;
     cur->ns = ns;
+
+    if (xmlRegisterNodeDefaultValue)
+	xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
     return(cur);
 }
 
@@ -3202,13 +3211,22 @@
     if (parent != NULL) {
 	xmlNodePtr tmp;
 
+	/*
+	 * this is a tricky part for the node register thing:
+	 * in case ret does get coalesced in xmlAddChild
+	 * the deregister-node callback is called; so we register ret now already
+	 */
+	if (xmlRegisterNodeDefaultValue)
+	    xmlRegisterNodeDefaultValue((xmlNodePtr)ret);
+
         tmp = xmlAddChild(parent, ret);
 	/* node could have coalesced */
 	if (tmp != ret)
 	    return(tmp);
     }
     
-    if (!recursive) return(ret);
+    if (!recursive)
+	goto out;
     if (node->nsDef != NULL)
         ret->nsDef = xmlCopyNamespaceList(node->nsDef);
 
@@ -3255,6 +3273,11 @@
         ret->children = xmlStaticCopyNodeList(node->children, doc, ret);
 	UPDATE_LAST_CHILD_AND_PARENT(ret)
     }
+
+out:
+    /* if parent != NULL we already registered the node above */
+    if (parent == NULL && xmlRegisterNodeDefaultValue)
+	xmlRegisterNodeDefaultValue((xmlNodePtr)ret);
     return(ret);
 }