[LIBXML2]

- Fix MSVC build (already fixed upstream)

svn path=/trunk/; revision=71877
This commit is contained in:
Thomas Faber 2016-07-09 21:01:11 +00:00
parent b938f584f2
commit ea98e8a8fd
2 changed files with 3 additions and 2 deletions

View file

@ -2088,6 +2088,7 @@ xmlRelaxNGGetErrorString(xmlRelaxNGValidErr err, const xmlChar * arg1,
const xmlChar * arg2) const xmlChar * arg2)
{ {
char msg[1000]; char msg[1000];
xmlChar *result;
if (arg1 == NULL) if (arg1 == NULL)
arg1 = BAD_CAST ""; arg1 = BAD_CAST "";
@ -2215,7 +2216,7 @@ xmlRelaxNGGetErrorString(xmlRelaxNGValidErr err, const xmlChar * arg1,
snprintf(msg, 1000, "Unknown error code %d\n", err); snprintf(msg, 1000, "Unknown error code %d\n", err);
} }
msg[1000 - 1] = 0; msg[1000 - 1] = 0;
xmlChar *result = xmlCharStrdup(msg); result = xmlCharStrdup(msg);
return (xmlEscapeFormatString(&result)); return (xmlEscapeFormatString(&result));
} }

View file

@ -3168,8 +3168,8 @@ xmlSchemaPSimpleTypeErr(xmlSchemaParserCtxtPtr ctxt,
"valid."); "valid.");
} }
if (expected) { 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)); msg = xmlStrcat(msg, xmlEscapeFormatString(&expectedEscaped));
FREE_AND_NULL(expectedEscaped); FREE_AND_NULL(expectedEscaped);
msg = xmlStrcat(msg, BAD_CAST "'.\n"); msg = xmlStrcat(msg, BAD_CAST "'.\n");