Fixed xmlSchemaPSimpleTypeErr(), which did not output the given string
* xmlschemas.c: Fixed xmlSchemaPSimpleTypeErr(), which did not
output the given string arguments correctly.
diff --git a/ChangeLog b/ChangeLog
index d00ebfc..8785467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 22 00:08:43 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
+
+ * xmlschemas.c: Fixed xmlSchemaPSimpleTypeErr(), which did not
+ output the given string arguments correctly.
+
Thu Jul 21 09:21:00 EDT 2005 Daniel Veillard <daniel@veillard.com>
* error.c globals.c parser.c runtest.c testHTML.c testSAX.c
diff --git a/xmlschemas.c b/xmlschemas.c
index aa9c6e3..cbd4ed7 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -2547,8 +2547,10 @@
else
xmlSchemaPErr(ctxt, node, error, (const char *) msg, NULL, NULL);
} else {
+ msg = xmlStrcat(msg, BAD_CAST message);
+ msg = xmlStrcat(msg, BAD_CAST "\n");
xmlSchemaPErrExt(ctxt, node, error, NULL, NULL, NULL,
- "%s%s.\n", msg, BAD_CAST message, str1, str2, NULL);
+ (const char*) msg, str1, str2, NULL, NULL, NULL);
}
/* Cleanup. */
FREE_AND_NULL(msg)
@@ -11325,7 +11327,7 @@
break;
}
case XML_SCHEMA_TYPE_ALL:{
- xmlAutomataStatePtr start, hop;
+ xmlAutomataStatePtr start;
xmlSchemaParticlePtr sub;
xmlSchemaElementPtr elemDecl;
int lax;