mirror of
https://github.com/reactos/reactos.git
synced 2025-08-02 04:45:43 +00:00
[LIBXML2] Update to version 2.9.10. CORE-16952
This commit is contained in:
Thomas Faber
parent
b82bf8ce16
commit
f22fa382fe
65 changed files with 2245 additions and 2056 deletions
92
sdk/lib/3rdparty/libxml2/xmllint.c
vendored
92
sdk/lib/3rdparty/libxml2/xmllint.c
vendored
|
|
@ -180,17 +180,17 @@ static int exc_canonical = 0;
|
|||
#ifdef LIBXML_READER_ENABLED
|
||||
static int stream = 0;
|
||||
static int walker = 0;
|
||||
#ifdef LIBXML_PATTERN_ENABLED
|
||||
static const char *pattern = NULL;
|
||||
static xmlPatternPtr patternc = NULL;
|
||||
static xmlStreamCtxtPtr patstream = NULL;
|
||||
#endif
|
||||
#endif /* LIBXML_READER_ENABLED */
|
||||
static int chkregister = 0;
|
||||
static int nbregister = 0;
|
||||
#ifdef LIBXML_SAX1_ENABLED
|
||||
static int sax1 = 0;
|
||||
#endif /* LIBXML_SAX1_ENABLED */
|
||||
#ifdef LIBXML_PATTERN_ENABLED
|
||||
static const char *pattern = NULL;
|
||||
static xmlPatternPtr patternc = NULL;
|
||||
static xmlStreamCtxtPtr patstream = NULL;
|
||||
#endif
|
||||
#ifdef LIBXML_XPATH_ENABLED
|
||||
static const char *xpathquery = NULL;
|
||||
#endif
|
||||
|
|
@ -519,7 +519,7 @@ endTimer(char *format, ...)
|
|||
#endif
|
||||
/************************************************************************
|
||||
* *
|
||||
* HTML ouput *
|
||||
* HTML output *
|
||||
* *
|
||||
************************************************************************/
|
||||
static char buffer[50000];
|
||||
|
|
@ -1652,10 +1652,7 @@ testSAX(const char *filename) {
|
|||
xmlSchemaValidCtxtPtr vctxt;
|
||||
|
||||
vctxt = xmlSchemaNewValidCtxt(wxschemas);
|
||||
xmlSchemaSetValidErrors(vctxt,
|
||||
(xmlSchemaValidityErrorFunc) fprintf,
|
||||
(xmlSchemaValidityWarningFunc) fprintf,
|
||||
stderr);
|
||||
xmlSchemaSetValidErrors(vctxt, xmlGenericError, xmlGenericError, NULL);
|
||||
xmlSchemaValidateSetFilename(vctxt, filename);
|
||||
|
||||
ret = xmlSchemaValidateStream(vctxt, buf, 0, handler,
|
||||
|
|
@ -2086,7 +2083,7 @@ static void doXPathDump(xmlXPathObjectPtr cur) {
|
|||
}
|
||||
for (i = 0;i < cur->nodesetval->nodeNr;i++) {
|
||||
node = cur->nodesetval->nodeTab[i];
|
||||
xmlNodeDumpOutput(buf, node->doc, node, 0, 0, NULL);
|
||||
xmlNodeDumpOutput(buf, NULL, node, 0, 0, NULL);
|
||||
xmlOutputBufferWrite(buf, 1, "\n");
|
||||
}
|
||||
xmlOutputBufferClose(buf);
|
||||
|
|
@ -2760,9 +2757,9 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
|
|||
"Couldn't allocate validation context\n");
|
||||
exit(-1);
|
||||
}
|
||||
cvp->userData = (void *) stderr;
|
||||
cvp->error = (xmlValidityErrorFunc) fprintf;
|
||||
cvp->warning = (xmlValidityWarningFunc) fprintf;
|
||||
cvp->userData = NULL;
|
||||
cvp->error = xmlGenericError;
|
||||
cvp->warning = xmlGenericError;
|
||||
|
||||
if ((timing) && (!repeat)) {
|
||||
startTimer();
|
||||
|
|
@ -2796,9 +2793,9 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
|
|||
if ((timing) && (!repeat)) {
|
||||
startTimer();
|
||||
}
|
||||
cvp->userData = (void *) stderr;
|
||||
cvp->error = (xmlValidityErrorFunc) fprintf;
|
||||
cvp->warning = (xmlValidityWarningFunc) fprintf;
|
||||
cvp->userData = NULL;
|
||||
cvp->error = xmlGenericError;
|
||||
cvp->warning = xmlGenericError;
|
||||
if (!xmlValidateDocument(cvp, doc)) {
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
"Document %s does not validate\n", filename);
|
||||
|
|
@ -2828,10 +2825,8 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
|
|||
flag |= XML_SCHEMATRON_OUT_QUIET;
|
||||
ctxt = xmlSchematronNewValidCtxt(wxschematron, flag);
|
||||
#if 0
|
||||
xmlSchematronSetValidErrors(ctxt,
|
||||
(xmlSchematronValidityErrorFunc) fprintf,
|
||||
(xmlSchematronValidityWarningFunc) fprintf,
|
||||
stderr);
|
||||
xmlSchematronSetValidErrors(ctxt, xmlGenericError, xmlGenericError,
|
||||
NULL);
|
||||
#endif
|
||||
ret = xmlSchematronValidateDoc(ctxt, doc);
|
||||
if (ret == 0) {
|
||||
|
|
@ -2860,10 +2855,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
|
|||
}
|
||||
|
||||
ctxt = xmlRelaxNGNewValidCtxt(relaxngschemas);
|
||||
xmlRelaxNGSetValidErrors(ctxt,
|
||||
(xmlRelaxNGValidityErrorFunc) fprintf,
|
||||
(xmlRelaxNGValidityWarningFunc) fprintf,
|
||||
stderr);
|
||||
xmlRelaxNGSetValidErrors(ctxt, xmlGenericError, xmlGenericError, NULL);
|
||||
ret = xmlRelaxNGValidateDoc(ctxt, doc);
|
||||
if (ret == 0) {
|
||||
fprintf(stderr, "%s validates\n", filename);
|
||||
|
|
@ -2888,10 +2880,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
|
|||
}
|
||||
|
||||
ctxt = xmlSchemaNewValidCtxt(wxschemas);
|
||||
xmlSchemaSetValidErrors(ctxt,
|
||||
(xmlSchemaValidityErrorFunc) fprintf,
|
||||
(xmlSchemaValidityWarningFunc) fprintf,
|
||||
stderr);
|
||||
xmlSchemaSetValidErrors(ctxt, xmlGenericError, xmlGenericError, NULL);
|
||||
ret = xmlSchemaValidateDoc(ctxt, doc);
|
||||
if (ret == 0) {
|
||||
fprintf(stderr, "%s validates\n", filename);
|
||||
|
|
@ -3069,10 +3058,10 @@ static void usage(FILE *f, const char *name) {
|
|||
#ifdef LIBXML_READER_ENABLED
|
||||
fprintf(f, "\t--stream : use the streaming interface to process very large files\n");
|
||||
fprintf(f, "\t--walker : create a reader and walk though the resulting doc\n");
|
||||
#endif /* LIBXML_READER_ENABLED */
|
||||
#ifdef LIBXML_PATTERN_ENABLED
|
||||
fprintf(f, "\t--pattern pattern_value : test the pattern support\n");
|
||||
#endif
|
||||
#endif /* LIBXML_READER_ENABLED */
|
||||
fprintf(f, "\t--chkregister : verify the node registration code\n");
|
||||
#ifdef LIBXML_SCHEMAS_ENABLED
|
||||
fprintf(f, "\t--relaxng schema : do RelaxNG validation against the schema\n");
|
||||
|
|
@ -3404,6 +3393,12 @@ main(int argc, char **argv) {
|
|||
(!strcmp(argv[i], "--walker"))) {
|
||||
walker++;
|
||||
noout++;
|
||||
#ifdef LIBXML_PATTERN_ENABLED
|
||||
} else if ((!strcmp(argv[i], "-pattern")) ||
|
||||
(!strcmp(argv[i], "--pattern"))) {
|
||||
i++;
|
||||
pattern = argv[i];
|
||||
#endif
|
||||
}
|
||||
#endif /* LIBXML_READER_ENABLED */
|
||||
#ifdef LIBXML_SAX1_ENABLED
|
||||
|
|
@ -3454,12 +3449,6 @@ main(int argc, char **argv) {
|
|||
(!strcmp(argv[i], "--path"))) {
|
||||
i++;
|
||||
parsePath(BAD_CAST argv[i]);
|
||||
#ifdef LIBXML_PATTERN_ENABLED
|
||||
} else if ((!strcmp(argv[i], "-pattern")) ||
|
||||
(!strcmp(argv[i], "--pattern"))) {
|
||||
i++;
|
||||
pattern = argv[i];
|
||||
#endif
|
||||
#ifdef LIBXML_XPATH_ENABLED
|
||||
} else if ((!strcmp(argv[i], "-xpath")) ||
|
||||
(!strcmp(argv[i], "--xpath"))) {
|
||||
|
|
@ -3552,10 +3541,8 @@ main(int argc, char **argv) {
|
|||
}
|
||||
ctxt = xmlSchematronNewParserCtxt(schematron);
|
||||
#if 0
|
||||
xmlSchematronSetParserErrors(ctxt,
|
||||
(xmlSchematronValidityErrorFunc) fprintf,
|
||||
(xmlSchematronValidityWarningFunc) fprintf,
|
||||
stderr);
|
||||
xmlSchematronSetParserErrors(ctxt, xmlGenericError, xmlGenericError,
|
||||
NULL);
|
||||
#endif
|
||||
wxschematron = xmlSchematronParse(ctxt);
|
||||
if (wxschematron == NULL) {
|
||||
|
|
@ -3585,10 +3572,8 @@ main(int argc, char **argv) {
|
|||
startTimer();
|
||||
}
|
||||
ctxt = xmlRelaxNGNewParserCtxt(relaxng);
|
||||
xmlRelaxNGSetParserErrors(ctxt,
|
||||
(xmlRelaxNGValidityErrorFunc) fprintf,
|
||||
(xmlRelaxNGValidityWarningFunc) fprintf,
|
||||
stderr);
|
||||
xmlRelaxNGSetParserErrors(ctxt, xmlGenericError, xmlGenericError,
|
||||
NULL);
|
||||
relaxngschemas = xmlRelaxNGParse(ctxt);
|
||||
if (relaxngschemas == NULL) {
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
|
|
@ -3611,10 +3596,7 @@ main(int argc, char **argv) {
|
|||
startTimer();
|
||||
}
|
||||
ctxt = xmlSchemaNewParserCtxt(schema);
|
||||
xmlSchemaSetParserErrors(ctxt,
|
||||
(xmlSchemaValidityErrorFunc) fprintf,
|
||||
(xmlSchemaValidityWarningFunc) fprintf,
|
||||
stderr);
|
||||
xmlSchemaSetParserErrors(ctxt, xmlGenericError, xmlGenericError, NULL);
|
||||
wxschemas = xmlSchemaParse(ctxt);
|
||||
if (wxschemas == NULL) {
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
|
|
@ -3628,12 +3610,8 @@ main(int argc, char **argv) {
|
|||
}
|
||||
}
|
||||
#endif /* LIBXML_SCHEMAS_ENABLED */
|
||||
#ifdef LIBXML_PATTERN_ENABLED
|
||||
if ((pattern != NULL)
|
||||
#ifdef LIBXML_READER_ENABLED
|
||||
&& (walker == 0)
|
||||
#endif
|
||||
) {
|
||||
#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED)
|
||||
if ((pattern != NULL) && (walker == 0)) {
|
||||
patternc = xmlPatterncompile((const xmlChar *) pattern, NULL, 0, NULL);
|
||||
if (patternc == NULL) {
|
||||
xmlGenericError(xmlGenericErrorContext,
|
||||
|
|
@ -3642,7 +3620,7 @@ main(int argc, char **argv) {
|
|||
pattern = NULL;
|
||||
}
|
||||
}
|
||||
#endif /* LIBXML_PATTERN_ENABLED */
|
||||
#endif /* LIBXML_READER_ENABLED && LIBXML_PATTERN_ENABLED */
|
||||
for (i = 1; i < argc ; i++) {
|
||||
if ((!strcmp(argv[i], "-encode")) ||
|
||||
(!strcmp(argv[i], "--encode"))) {
|
||||
|
|
@ -3696,7 +3674,7 @@ main(int argc, char **argv) {
|
|||
i++;
|
||||
continue;
|
||||
}
|
||||
#ifdef LIBXML_PATTERN_ENABLED
|
||||
#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED)
|
||||
if ((!strcmp(argv[i], "-pattern")) ||
|
||||
(!strcmp(argv[i], "--pattern"))) {
|
||||
i++;
|
||||
|
|
@ -3780,7 +3758,7 @@ main(int argc, char **argv) {
|
|||
xmlSchemaFree(wxschemas);
|
||||
xmlRelaxNGCleanupTypes();
|
||||
#endif
|
||||
#ifdef LIBXML_PATTERN_ENABLED
|
||||
#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED)
|
||||
if (patternc != NULL)
|
||||
xmlFreePattern(patternc);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue