[LIBXML2]

- Fix MSVC build (already fixed upstream)

svn path=/trunk/; revision=71877

diff --git a/reactos/sdk/lib/3rdparty/libxml2/relaxng.c b/reactos/sdk/lib/3rdparty/libxml2/relaxng.c
index 56a3344..3d3e69c 100644 (file)
--- a/reactos/sdk/lib/3rdparty/libxml2/relaxng.c
+++ b/reactos/sdk/lib/3rdparty/libxml2/relaxng.c
@@ -2088,6 +2088,7 @@ xmlRelaxNGGetErrorString(xmlRelaxNGValidErr err, const xmlChar * arg1,
                          const xmlChar * arg2)
 {
     char msg[1000];
                          const xmlChar * arg2)
 {
     char msg[1000];

+    xmlChar *result;

 
     if (arg1 == NULL)
         arg1 = BAD_CAST "";
 
     if (arg1 == NULL)
         arg1 = BAD_CAST "";


@@ -2215,7 +2216,7 @@ xmlRelaxNGGetErrorString(xmlRelaxNGValidErr err, const xmlChar * arg1,
         snprintf(msg, 1000, "Unknown error code %d\n", err);
     }
     msg[1000 - 1] = 0;
         snprintf(msg, 1000, "Unknown error code %d\n", err);
     }
     msg[1000 - 1] = 0;

-    xmlChar *result = xmlCharStrdup(msg);
+    result = xmlCharStrdup(msg);

     return (xmlEscapeFormatString(&result));
 }
 
     return (xmlEscapeFormatString(&result));
 }
 

diff --git a/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c b/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c
index e1b3a4f..7afe2eb 100644 (file)
--- a/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c
+++ b/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c
@@ -3168,8 +3168,8 @@ xmlSchemaPSimpleTypeErr(xmlSchemaParserCtxtPtr ctxt,
                "valid.");
        }
        if (expected) {
                "valid.");
        }
        if (expected) {

-           msg = xmlStrcat(msg, BAD_CAST " Expected is '");

            xmlChar *expectedEscaped = xmlCharStrdup(expected);
            xmlChar *expectedEscaped = xmlCharStrdup(expected);

+           msg = xmlStrcat(msg, BAD_CAST " Expected is '");

            msg = xmlStrcat(msg, xmlEscapeFormatString(&expectedEscaped));
            FREE_AND_NULL(expectedEscaped);
            msg = xmlStrcat(msg, BAD_CAST "'.\n");
            msg = xmlStrcat(msg, xmlEscapeFormatString(&expectedEscaped));
            FREE_AND_NULL(expectedEscaped);
            msg = xmlStrcat(msg, BAD_CAST "'.\n");