Imported Upstream version 2.9.6_rc1

[platform/upstream/libxml2.git] / schematron.c

diff --git a/schematron.c b/schematron.c
index 537b868..6200f2d 100644 (file)
--- a/schematron.c
+++ b/schematron.c
@@ -133,7 +133,7 @@ struct _xmlSchematron {
     int flags;                 /* specific to this schematron */
 
     void *_private;            /* unused by the library */
-    xmlDictPtr dict;           /* the dictionnary used internally */
+    xmlDictPtr dict;           /* the dictionary used internally */
 
     const xmlChar *title;      /* the title if any */
 
@@ -165,8 +165,10 @@ struct _xmlSchematronValidCtxt {
 
     FILE *outputFile;          /* if using XML_SCHEMATRON_OUT_FILE */
     xmlBufferPtr outputBuffer; /* if using XML_SCHEMATRON_OUT_BUFFER */
+#ifdef LIBXML_OUTPUT_ENABLED
     xmlOutputWriteCallback iowrite; /* if using XML_SCHEMATRON_OUT_IO */
     xmlOutputCloseCallback  ioclose;
+#endif
     void *ioctx;
 
     /* error reporting data */
@@ -184,7 +186,7 @@ struct _xmlSchematronParserCtxt {
     const char *buffer;
     int size;
 
-    xmlDictPtr dict;            /* dictionnary for interned string names */
+    xmlDictPtr dict;            /* dictionary for interned string names */
 
     int nberrors;
     int err;
@@ -243,7 +245,7 @@ xmlSchematronPErrMemory(xmlSchematronParserCtxtPtr ctxt,
  *
  * Handle a parser error
  */
-static void
+static void LIBXML_ATTR_FORMAT(4,0)
 xmlSchematronPErr(xmlSchematronParserCtxtPtr ctxt, xmlNodePtr node, int error,
               const char *msg, const xmlChar * str1, const xmlChar * str2)
 {