Update libxml to 2.7.7.

third_party/libxml/error.c

 /*
  * error.c: module displaying/handling XML parser errors
  *
  * See Copyright for the status of this software.
  *
  * Daniel Veillard <daniel@veillard.com>
  */
 
 #define IN_LIBXML
 #include "libxml.h"
@@ skipping 114 matching lines @@
  *
  * Function to reset the handler and the error context for out of
  * context structured error messages.
  * This simply means that @handler will be called for subsequent
  * error messages while not parsing nor validating. And @ctx will
  * be passed as first argument to @handler
  * For multi-threaded applications, this must be set separately for each thread.
  */
 void
 xmlSetStructuredErrorFunc(void *ctx, xmlStructuredErrorFunc handler) {
-    xmlGenericErrorContext = ctx;
+    xmlStructuredErrorContext = ctx;
     xmlStructuredError = handler;
 }
 
 /************************************************************************
  *                                                                      *
  *                      Handling of parsing errors                      *
  *                                                                      *
  ************************************************************************/
 
 /**
@@ skipping 318 matching lines @@
     }
     /*
      * Check if structured error handler set
      */
     if (schannel == NULL) {
         schannel = xmlStructuredError;
         /*
          * if user has defined handler, change data ptr to user's choice
          */
         if (schannel != NULL)
-            data = xmlGenericErrorContext;
+            data = xmlStructuredErrorContext;
     }
     if ((domain == XML_FROM_VALID) &&
         ((channel == xmlParserValidityError) ||
          (channel == xmlParserValidityWarning))) {
         ctxt = (xmlParserCtxtPtr) ctx;
         if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
             (ctxt->sax->initialized == XML_SAX2_MAGIC))
             schannel = ctxt->sax->serror;
     }
     if (code == XML_ERR_OK)
@@ skipping 81 matching lines @@
                 prev->type = XML_XINCLUDE_START;
             } else {
                 to->file = (char *) xmlGetProp(prev, BAD_CAST "href");
             }
         } else
 #endif
             to->file = (char *) xmlStrdup(baseptr->doc->URL);
         if ((to->file == NULL) && (node != NULL) && (node->doc != NULL)) {
             to->file = (char *) xmlStrdup(node->doc->URL);
         }
-        file = to->file;
     }
     to->line = line;
     if (str1 != NULL)
         to->str1 = (char *) xmlStrdup((const xmlChar *) str1);
     if (str2 != NULL)
         to->str2 = (char *) xmlStrdup((const xmlChar *) str2);
     if (str3 != NULL)
         to->str3 = (char *) xmlStrdup((const xmlChar *) str3);
     to->int1 = int1;
     to->int2 = col;
     to->node = node;
     to->ctxt = ctx;
 
     if (to != &xmlLastError)
         xmlCopyError(to,&xmlLastError);
 
     /*
      * Find the callback channel if channel param is NULL
      */
-    if ((ctxt != NULL) && (channel == NULL) && (xmlStructuredError == NULL) && (ctxt->sax != NULL)) {
+    if ((ctxt != NULL) && (channel == NULL) &&
+        (xmlStructuredError == NULL) && (ctxt->sax != NULL)) {
         if (level == XML_ERR_WARNING)
             channel = ctxt->sax->warning;
         else
             channel = ctxt->sax->error;
         data = ctxt->userData;
     } else if (channel == NULL) {
-        if (xmlStructuredError != NULL)
+        if ((schannel == NULL) && (xmlStructuredError != NULL)) {
             schannel = xmlStructuredError;
-        else
+            data = xmlStructuredErrorContext;
+        } else {
             channel = xmlGenericError;
-        if (!data) {
-        data = xmlGenericErrorContext;
-    }
+            if (!data) {
+                data = xmlGenericErrorContext;
+            }
+        }
     }
     if (schannel != NULL) {
         schannel(data, to);
         return;
     }
     if (channel == NULL)
         return;
 
     if ((channel == xmlParserError) ||
         (channel == xmlParserWarning) ||
@@ skipping 300 matching lines @@
  * Cleanup the last global error registered. For parsing error
  * this does not change the well-formedness result.
  */
 void
 xmlCtxtResetLastError(void *ctx)
 {
     xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
 
     if (ctxt == NULL)
         return;
+    ctxt->errNo = XML_ERR_OK;
     if (ctxt->lastError.code == XML_ERR_OK)
         return;
     xmlResetError(&ctxt->lastError);
 }
 
 /**
  * xmlCopyError:
  * @from:  a source error
  * @to:  a target error
  *
@@ skipping 37 matching lines @@
     to->file = file;
     to->str1 = str1;
     to->str2 = str2;
     to->str3 = str3;
 
     return 0;
 }
 
 #define bottom_error
 #include "elfgcchack.h"