Roll libxml to 2.9.3

third_party/libxml/src/tree.c

 /*
  * tree.c : implementation of access function for an XML tree.
  *
  * References:
  *   XHTML 1.0 W3C REC: http://www.w3.org/TR/2002/REC-xhtml1-20020801/
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  *
@@ skipping 1433 matching lines @@
         if (xmlBufAdd(buf, q, cur - q))
             goto out;
     }
 
     if (!xmlBufIsEmpty(buf)) {
         node = xmlNewDocText(doc, NULL);
         if (node == NULL) goto out;
         node->content = xmlBufDetach(buf);
 
         if (last == NULL) {
-            last = ret = node;
+            ret = node;
         } else {
-            last = xmlAddNextSibling(last, node);
+            xmlAddNextSibling(last, node);
         }
     } else if (ret == NULL) {
         ret = xmlNewDocText(doc, BAD_CAST "");
     }
 
 out:
     xmlBufFree(buf);
     return(ret);
 }
 
@@ skipping 165 matching lines @@
          * Handle the last piece of text.
          */
         xmlBufAdd(buf, q, cur - q);
     }
 
     if (!xmlBufIsEmpty(buf)) {
         node = xmlNewDocText(doc, NULL);
         node->content = xmlBufDetach(buf);
 
         if (last == NULL) {
-            last = ret = node;
+            ret = node;
         } else {
-            last = xmlAddNextSibling(last, node);
+            xmlAddNextSibling(last, node);
         }
     }
 
 out:
     xmlBufFree(buf);
     return(ret);
 }
 
 /**
  * xmlNodeListGetString:
@@ skipping 1137 matching lines @@
 void
 xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) {
     xmlAttrPtr prop;
 
     if ((tree == NULL) || (tree->type == XML_NAMESPACE_DECL))
         return;
     if (tree->doc != doc) {
         if(tree->type == XML_ELEMENT_NODE) {
             prop = tree->properties;
             while (prop != NULL) {
+                if (prop->atype == XML_ATTRIBUTE_ID) {
+                    xmlRemoveID(tree->doc, prop);
+                }
+
                 prop->doc = doc;
                 xmlSetListDoc(prop->children, doc);
+
+                /*
+                 * TODO: ID attributes should be also added to the new
+                 * document, but this breaks things like xmlReplaceNode.
+                 * The underlying problem is that xmlRemoveID is only called
+                 * if a node is destroyed, not if it's unlinked.
+                 */
+#if 0
+                if (xmlIsID(doc, tree, prop)) {
+                    xmlChar *idVal = xmlNodeListGetString(doc, prop->children,
+                                                          1);
+                    xmlAddID(NULL, doc, idVal, prop);
+                }
+#endif
+
                 prop = prop->next;
             }
         }
         if (tree->children != NULL)
             xmlSetListDoc(tree->children, doc);
         tree->doc = doc;
     }
 }
 
 /**
@@ skipping 7279 matching lines @@
             }
             default:
                 break;
         }
     }
     return (0);
 }
 
 #define bottom_tree
 #include "elfgcchack.h"