Index: third_party/libxml/include/libxml/xmlschemas.h |
diff --git a/third_party/libxml/include/libxml/xmlschemas.h b/third_party/libxml/include/libxml/xmlschemas.h |
index 15faef582cff1d25f30f93e58d30a3aa6a834000..752bc3ad79cd1d0f30b39e1974861e9060a2a862 100644 |
--- a/third_party/libxml/include/libxml/xmlschemas.h |
+++ b/third_party/libxml/include/libxml/xmlschemas.h |
@@ -56,7 +56,7 @@ typedef enum { |
/* |
* ATTENTION: Change xmlSchemaSetValidOptions's check |
-* for invalid values, if adding to the validation |
+* for invalid values, if adding to the validation |
* options below. |
*/ |
/** |
@@ -85,11 +85,28 @@ typedef struct _xmlSchema xmlSchema; |
typedef xmlSchema *xmlSchemaPtr; |
/** |
- * A schemas validation context |
+ * xmlSchemaValidityErrorFunc: |
+ * @ctx: the validation context |
+ * @msg: the message |
+ * @...: extra arguments |
+ * |
+ * Signature of an error callback from an XSD validation |
+ */ |
+typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); |
+ |
+/** |
+ * xmlSchemaValidityWarningFunc: |
+ * @ctx: the validation context |
+ * @msg: the message |
+ * @...: extra arguments |
+ * |
+ * Signature of a warning callback from an XSD validation |
*/ |
-typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...); |
-typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...); |
+typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); |
+/** |
+ * A schemas validation context |
+ */ |
typedef struct _xmlSchemaParserCtxt xmlSchemaParserCtxt; |
typedef xmlSchemaParserCtxt *xmlSchemaParserCtxtPtr; |
@@ -99,16 +116,16 @@ typedef xmlSchemaValidCtxt *xmlSchemaValidCtxtPtr; |
/* |
* Interfaces for parsing. |
*/ |
-XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL |
+XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL |
xmlSchemaNewParserCtxt (const char *URL); |
-XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL |
+XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL |
xmlSchemaNewMemParserCtxt (const char *buffer, |
int size); |
XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL |
xmlSchemaNewDocParserCtxt (xmlDocPtr doc); |
-XMLPUBFUN void XMLCALL |
+XMLPUBFUN void XMLCALL |
xmlSchemaFreeParserCtxt (xmlSchemaParserCtxtPtr ctxt); |
-XMLPUBFUN void XMLCALL |
+XMLPUBFUN void XMLCALL |
xmlSchemaSetParserErrors (xmlSchemaParserCtxtPtr ctxt, |
xmlSchemaValidityErrorFunc err, |
xmlSchemaValidityWarningFunc warn, |
@@ -125,19 +142,19 @@ XMLPUBFUN int XMLCALL |
XMLPUBFUN int XMLCALL |
xmlSchemaIsValid (xmlSchemaValidCtxtPtr ctxt); |
-XMLPUBFUN xmlSchemaPtr XMLCALL |
+XMLPUBFUN xmlSchemaPtr XMLCALL |
xmlSchemaParse (xmlSchemaParserCtxtPtr ctxt); |
-XMLPUBFUN void XMLCALL |
+XMLPUBFUN void XMLCALL |
xmlSchemaFree (xmlSchemaPtr schema); |
#ifdef LIBXML_OUTPUT_ENABLED |
-XMLPUBFUN void XMLCALL |
+XMLPUBFUN void XMLCALL |
xmlSchemaDump (FILE *output, |
xmlSchemaPtr schema); |
#endif /* LIBXML_OUTPUT_ENABLED */ |
/* |
* Interfaces for validating |
*/ |
-XMLPUBFUN void XMLCALL |
+XMLPUBFUN void XMLCALL |
xmlSchemaSetValidErrors (xmlSchemaValidCtxtPtr ctxt, |
xmlSchemaValidityErrorFunc err, |
xmlSchemaValidityWarningFunc warn, |
@@ -157,11 +174,11 @@ XMLPUBFUN int XMLCALL |
XMLPUBFUN int XMLCALL |
xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxtPtr ctxt); |
-XMLPUBFUN xmlSchemaValidCtxtPtr XMLCALL |
+XMLPUBFUN xmlSchemaValidCtxtPtr XMLCALL |
xmlSchemaNewValidCtxt (xmlSchemaPtr schema); |
-XMLPUBFUN void XMLCALL |
+XMLPUBFUN void XMLCALL |
xmlSchemaFreeValidCtxt (xmlSchemaValidCtxtPtr ctxt); |
-XMLPUBFUN int XMLCALL |
+XMLPUBFUN int XMLCALL |
xmlSchemaValidateDoc (xmlSchemaValidCtxtPtr ctxt, |
xmlDocPtr instance); |
XMLPUBFUN int XMLCALL |
@@ -178,8 +195,11 @@ XMLPUBFUN int XMLCALL |
const char * filename, |
int options); |
+XMLPUBFUN xmlParserCtxtPtr XMLCALL |
+ xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxtPtr ctxt); |
+ |
/* |
- * Interface to insert Schemas SAX velidation in a SAX stream |
+ * Interface to insert Schemas SAX validation in a SAX stream |
*/ |
typedef struct _xmlSchemaSAXPlug xmlSchemaSAXPlugStruct; |
typedef xmlSchemaSAXPlugStruct *xmlSchemaSAXPlugPtr; |