diff --git a/xmllint.c b/xmllint.c index 5f99d0a0..2023e68a 100644 --- a/xmllint.c +++ b/xmllint.c @@ -494,7 +494,7 @@ xmlHTMLEncodeSend(void) { memset(&buffer[sizeof(buffer)-4], 0, 4); result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer); if (result) { - xmlGenericError(xmlGenericErrorContext, "%s", result); + fprintf(stderr, "%s", result); xmlFree(result); } buffer[0] = 0; @@ -510,7 +510,7 @@ xmlHTMLEncodeSend(void) { static void xmlHTMLPrintFileInfo(xmlParserInputPtr input) { int len; - xmlGenericError(xmlGenericErrorContext, "

"); + fprintf(stderr, "

"); len = strlen(buffer); if (input != NULL) { @@ -538,7 +538,7 @@ xmlHTMLPrintFileContext(xmlParserInputPtr input) { int n; if (input == NULL) return; - xmlGenericError(xmlGenericErrorContext, "

\n");
+    fprintf(stderr, "
\n");
     cur = input->cur;
     base = input->base;
     while ((cur > base) && ((*cur == '\n') || (*cur == '\r'))) {
@@ -570,7 +570,7 @@ xmlHTMLPrintFileContext(xmlParserInputPtr input) {
     len = strlen(buffer);
     snprintf(&buffer[len], sizeof(buffer) - len, "^\n");
     xmlHTMLEncodeSend();
-    xmlGenericError(xmlGenericErrorContext, "
"); + fprintf(stderr, "
"); } /** @@ -598,13 +598,13 @@ xmlHTMLError(void *ctx, const char *msg, ...) xmlHTMLPrintFileInfo(input); - xmlGenericError(xmlGenericErrorContext, "error: "); + fprintf(stderr, "error: "); va_start(args, msg); len = strlen(buffer); vsnprintf(&buffer[len], sizeof(buffer) - len, msg, args); va_end(args); xmlHTMLEncodeSend(); - xmlGenericError(xmlGenericErrorContext, "

\n"); + fprintf(stderr, "

\n"); xmlHTMLPrintFileContext(input); xmlHTMLEncodeSend(); @@ -636,13 +636,13 @@ xmlHTMLWarning(void *ctx, const char *msg, ...) xmlHTMLPrintFileInfo(input); - xmlGenericError(xmlGenericErrorContext, "warning: "); + fprintf(stderr, "warning: "); va_start(args, msg); len = strlen(buffer); vsnprintf(&buffer[len], sizeof(buffer) - len, msg, args); va_end(args); xmlHTMLEncodeSend(); - xmlGenericError(xmlGenericErrorContext, "

\n"); + fprintf(stderr, "

\n"); xmlHTMLPrintFileContext(input); xmlHTMLEncodeSend(); @@ -672,13 +672,13 @@ xmlHTMLValidityError(void *ctx, const char *msg, ...) xmlHTMLPrintFileInfo(input); - xmlGenericError(xmlGenericErrorContext, "validity error: "); + fprintf(stderr, "validity error: "); len = strlen(buffer); va_start(args, msg); vsnprintf(&buffer[len], sizeof(buffer) - len, msg, args); va_end(args); xmlHTMLEncodeSend(); - xmlGenericError(xmlGenericErrorContext, "

\n"); + fprintf(stderr, "

\n"); xmlHTMLPrintFileContext(input); xmlHTMLEncodeSend(); @@ -709,13 +709,13 @@ xmlHTMLValidityWarning(void *ctx, const char *msg, ...) xmlHTMLPrintFileInfo(input); - xmlGenericError(xmlGenericErrorContext, "validity warning: "); + fprintf(stderr, "validity warning: "); va_start(args, msg); len = strlen(buffer); vsnprintf(&buffer[len], sizeof(buffer) - len, msg, args); va_end(args); xmlHTMLEncodeSend(); - xmlGenericError(xmlGenericErrorContext, "

\n"); + fprintf(stderr, "

\n"); xmlHTMLPrintFileContext(input); xmlHTMLEncodeSend(); @@ -1615,7 +1615,6 @@ testSAX(const char *filename) { xmlFreeParserInputBuffer(buf); return; } - xmlSchemaSetValidErrors(vctxt, xmlGenericError, xmlGenericError, NULL); xmlSchemaValidateSetFilename(vctxt, filename); ret = xmlSchemaValidateStream(vctxt, buf, 0, handler, @@ -1817,7 +1816,7 @@ static void streamFile(char *filename) { } ret = xmlTextReaderRelaxNGValidate(reader, relaxng); if (ret < 0) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Relax-NG schema %s failed to compile\n", relaxng); progresult = XMLLINT_ERR_SCHEMACOMP; relaxng = NULL; @@ -1832,7 +1831,7 @@ static void streamFile(char *filename) { } ret = xmlTextReaderSchemaValidate(reader, schema); if (ret < 0) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "XSD schema %s failed to compile\n", schema); progresult = XMLLINT_ERR_SCHEMACOMP; schema = NULL; @@ -1876,7 +1875,7 @@ static void streamFile(char *filename) { #ifdef LIBXML_VALID_ENABLED if (valid) { if (xmlTextReaderIsValid(reader) != 1) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Document %s does not validate\n", filename); progresult = XMLLINT_ERR_VALID; } @@ -1933,7 +1932,7 @@ static void walkDoc(xmlDocPtr doc) { root = xmlDocGetRootElement(doc); if (root == NULL ) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Document does not have a root element"); progresult = XMLLINT_ERR_UNCLASS; return; @@ -1949,7 +1948,7 @@ static void walkDoc(xmlDocPtr doc) { patternc = xmlPatterncompile((const xmlChar *) pattern, doc->dict, 0, &namespaces[0]); if (patternc == NULL) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Pattern %s failed to compile\n", pattern); progresult = XMLLINT_ERR_SCHEMAPAT; pattern = NULL; @@ -2726,35 +2725,33 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { } if (dtd == NULL) { if (dtdvalid != NULL) - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Could not parse DTD %s\n", dtdvalid); else - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Could not parse DTD %s\n", dtdvalidfpi); progresult = XMLLINT_ERR_DTD; } else { xmlValidCtxtPtr cvp; if ((cvp = xmlNewValidCtxt()) == NULL) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Couldn't allocate validation context\n"); progresult = XMLLINT_ERR_MEM; xmlFreeDtd(dtd); return; } - cvp->error = xmlGenericError; - cvp->warning = xmlGenericError; if ((timing) && (!repeat)) { startTimer(); } if (!xmlValidateDtd(cvp, doc, dtd)) { if (dtdvalid != NULL) - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Document %s does not validate against %s\n", filename, dtdvalid); else - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Document %s does not validate against %s\n", filename, dtdvalidfpi); progresult = XMLLINT_ERR_VALID; @@ -2769,7 +2766,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { xmlValidCtxtPtr cvp; if ((cvp = xmlNewValidCtxt()) == NULL) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Couldn't allocate validation context\n"); progresult = XMLLINT_ERR_MEM; xmlFreeDoc(doc); @@ -2779,10 +2776,8 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { if ((timing) && (!repeat)) { startTimer(); } - cvp->error = xmlGenericError; - cvp->warning = xmlGenericError; if (!xmlValidateDocument(cvp, doc)) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Document %s does not validate\n", filename); progresult = XMLLINT_ERR_VALID; } @@ -2814,10 +2809,6 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { xmlFreeDoc(doc); return; } -#if 0 - xmlSchematronSetValidErrors(ctxt, xmlGenericError, xmlGenericError, - NULL); -#endif ret = xmlSchematronValidateDoc(ctxt, doc); if (ret == 0) { if (!quiet) { @@ -2852,7 +2843,6 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { xmlFreeDoc(doc); return; } - xmlRelaxNGSetValidErrors(ctxt, xmlGenericError, xmlGenericError, NULL); ret = xmlRelaxNGValidateDoc(ctxt, doc); if (ret == 0) { if (!quiet) { @@ -2884,7 +2874,6 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { xmlFreeDoc(doc); return; } - xmlSchemaSetValidErrors(ctxt, xmlGenericError, xmlGenericError, NULL); ret = xmlSchemaValidateDoc(ctxt, doc); if (ret == 0) { if (!quiet) { @@ -3540,14 +3529,14 @@ main(int argc, char **argv) { if ((noblanks != 0) || (format == 1)) options |= XML_PARSE_NOBLANKS; if ((htmlout) && (!nowrap)) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "\n"); - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "%s output\n", argv[0]); - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "

%s output

\n", argv[0]); } @@ -3570,13 +3559,9 @@ main(int argc, char **argv) { progresult = XMLLINT_ERR_MEM; goto error; } -#if 0 - xmlSchematronSetParserErrors(ctxt, xmlGenericError, xmlGenericError, - NULL); -#endif wxschematron = xmlSchematronParse(ctxt); if (wxschematron == NULL) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Schematron schema %s failed to compile\n", schematron); progresult = XMLLINT_ERR_SCHEMACOMP; schematron = NULL; @@ -3605,11 +3590,9 @@ main(int argc, char **argv) { progresult = XMLLINT_ERR_MEM; goto error; } - xmlRelaxNGSetParserErrors(ctxt, xmlGenericError, xmlGenericError, - NULL); relaxngschemas = xmlRelaxNGParse(ctxt); if (relaxngschemas == NULL) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Relax-NG schema %s failed to compile\n", relaxng); progresult = XMLLINT_ERR_SCHEMACOMP; relaxng = NULL; @@ -3633,10 +3616,9 @@ main(int argc, char **argv) { progresult = XMLLINT_ERR_MEM; goto error; } - xmlSchemaSetParserErrors(ctxt, xmlGenericError, xmlGenericError, NULL); wxschemas = xmlSchemaParse(ctxt); if (wxschemas == NULL) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "WXS schema %s failed to compile\n", schema); progresult = XMLLINT_ERR_SCHEMACOMP; schema = NULL; @@ -3651,7 +3633,7 @@ main(int argc, char **argv) { if ((pattern != NULL) && (walker == 0)) { patternc = xmlPatterncompile((const xmlChar *) pattern, NULL, 0, NULL); if (patternc == NULL) { - xmlGenericError(xmlGenericErrorContext, + fprintf(stderr, "Pattern %s failed to compile\n", pattern); progresult = XMLLINT_ERR_SCHEMAPAT; pattern = NULL; @@ -3790,7 +3772,7 @@ main(int argc, char **argv) { if (generate) parseAndPrintFile(NULL, NULL); if ((htmlout) && (!nowrap)) { - xmlGenericError(xmlGenericErrorContext, "\n"); + fprintf(stderr, "\n"); } if ((files == 0) && (!generate) && (version == 0)) { usage(stderr, argv[0]);