From 95ffa8d234319337e7b213091fbb22a53bd0b862 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Fri, 18 Apr 2025 22:54:40 +0200 Subject: [PATCH] xmllint: Remove --debugent option --- doc/xmllint.xml | 8 -------- fuzz/lint.c | 2 +- xmllint.c | 18 ------------------ 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/doc/xmllint.xml b/doc/xmllint.xml index 8d7595258..85854438a 100644 --- a/doc/xmllint.xml +++ b/doc/xmllint.xml @@ -69,7 +69,6 @@ - @@ -602,13 +601,6 @@ - - - - Debug the entities defined in the document. - - - diff --git a/fuzz/lint.c b/fuzz/lint.c index 09ce02161..7db6984b9 100644 --- a/fuzz/lint.c +++ b/fuzz/lint.c @@ -47,7 +47,7 @@ static const char *const switches[] = { "--compress", "--copy", "--debug", - "--debugent", + NULL, "--dropdtd", "--dtdattr", "--exc-c14n", diff --git a/xmllint.c b/xmllint.c index 13c9368ac..b160ffea5 100644 --- a/xmllint.c +++ b/xmllint.c @@ -128,9 +128,6 @@ typedef struct { int sax; int callbacks; int shell; -#ifdef LIBXML_DEBUG_ENABLED - int debugent; -#endif int debug; int copy; int noout; @@ -2606,15 +2603,6 @@ parseAndPrintFile(xmllintState *lint, const char *filename) { } #endif /* LIBXML_SCHEMAS_ENABLED */ -#ifdef LIBXML_DEBUG_ENABLED - if ((lint->debugent) -#if defined(LIBXML_HTML_ENABLED) - && (!lint->html) -#endif - ) - xmlDebugDumpEntities(errStream, doc); -#endif - /* Avoid unused label warning */ goto done; @@ -2685,7 +2673,6 @@ static void usage(FILE *f, const char *name) { fprintf(f, "\t--shell : run a navigating shell\n"); #ifdef LIBXML_DEBUG_ENABLED fprintf(f, "\t--debug : dump a debug tree of the in-memory document\n"); - fprintf(f, "\t--debugent : debug the entities defined in the document\n"); #else #ifdef LIBXML_READER_ENABLED fprintf(f, "\t--debug : dump the nodes content when using --stream\n"); @@ -3054,11 +3041,6 @@ xmllintParseOptions(xmllintState *lint, int argc, const char **argv) { (!strcmp(argv[i], "--pedantic"))) { lint->options |= XML_PARSE_PEDANTIC; lint->options &= ~XML_PARSE_NOWARNING; -#ifdef LIBXML_DEBUG_ENABLED - } else if ((!strcmp(argv[i], "-debugent")) || - (!strcmp(argv[i], "--debugent"))) { - lint->debugent = 1; -#endif #ifdef LIBXML_C14N_ENABLED } else if ((!strcmp(argv[i], "-c14n")) || (!strcmp(argv[i], "--c14n"))) {