From ea98e8a8fddaecf5a718b1ec8963b0a8d7a5d385 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 9 Jul 2016 21:01:11 +0000 Subject: [PATCH] [LIBXML2] - Fix MSVC build (already fixed upstream) svn path=/trunk/; revision=71877 --- reactos/sdk/lib/3rdparty/libxml2/relaxng.c | 3 ++- reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/sdk/lib/3rdparty/libxml2/relaxng.c b/reactos/sdk/lib/3rdparty/libxml2/relaxng.c index 56a3344a2fe..3d3e69c0e36 100644 --- 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]; + xmlChar *result; 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; - xmlChar *result = xmlCharStrdup(msg); + result = xmlCharStrdup(msg); return (xmlEscapeFormatString(&result)); } diff --git a/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c b/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c index e1b3a4f0386..7afe2ebfada 100644 --- 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) { - msg = xmlStrcat(msg, BAD_CAST " Expected is '"); 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"); -- 2.17.1