Roll libxml to bdec2183f34b37ee89ae1d330c6ad2bb4d76605f

third_party/libxml/src/relaxng.c

 /*
  * relaxng.c : implementation of the Relax-NG handling and validity checking
  *
  * See Copyright for the status of this software.
  *
  * Daniel Veillard <veillard@redhat.com>
  */
 
 /**
  * TODO:
@@ skipping 489 matching lines @@
  * xmlRngPErr:
  * @ctxt:  a Relax-NG parser context
  * @node:  the node raising the error
  * @error:  the error code
  * @msg:  message
  * @str1:  extra info
  * @str2:  extra info
  *
  * Handle a Relax NG Parsing error
  */
-static void
+static void LIBXML_ATTR_FORMAT(4,0)
 xmlRngPErr(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, int error,
            const char *msg, const xmlChar * str1, const xmlChar * str2)
 {
     xmlStructuredErrorFunc schannel = NULL;
     xmlGenericErrorFunc channel = NULL;
     void *data = NULL;
 
     if (ctxt != NULL) {
         if (ctxt->serror != NULL)
             schannel = ctxt->serror;
@@ skipping 13 matching lines @@
  * xmlRngVErr:
  * @ctxt:  a Relax-NG validation context
  * @node:  the node raising the error
  * @error:  the error code
  * @msg:  message
  * @str1:  extra info
  * @str2:  extra info
  *
  * Handle a Relax NG Validation error
  */
-static void
+static void LIBXML_ATTR_FORMAT(4,0)
 xmlRngVErr(xmlRelaxNGValidCtxtPtr ctxt, xmlNodePtr node, int error,
            const char *msg, const xmlChar * str1, const xmlChar * str2)
 {
     xmlStructuredErrorFunc schannel = NULL;
     xmlGenericErrorFunc channel = NULL;
     void *data = NULL;
 
     if (ctxt != NULL) {
         if (ctxt->serror != NULL)
             schannel = ctxt->serror;
@@ skipping 1653 matching lines @@
             return (xmlCharStrdup("No top grammar defined\n"));
         case XML_RELAXNG_ERR_EXTRADATA:
             return (xmlCharStrdup("Extra data in the document\n"));
         default:
             return (xmlCharStrdup("Unknown error !\n"));
     }
     if (msg[0] == 0) {
         snprintf(msg, 1000, "Unknown error code %d\n", err);
     }
     msg[1000 - 1] = 0;
-    return (xmlStrdup((xmlChar *) msg));
+    xmlChar *result = xmlCharStrdup(msg);
+    return (xmlEscapeFormatString(&result));
 }
 
 /**
  * xmlRelaxNGShowValidError:
  * @ctxt:  the validation context
  * @err:  the error number
  * @node:  the node
  * @child:  the node child generating the problem.
  * @arg1:  the first argument
  * @arg2:  the second argument
@@ skipping 8819 matching lines @@
      * TODO: build error codes
      */
     if (ret == -1)
         return (1);
     return (ret);
 }
 
 #define bottom_relaxng
 #include "elfgcchack.h"
 #endif /* LIBXML_SCHEMAS_ENABLED */