From 9553695d17d5a25e9a2b39ed70307c9e5f85fdd1 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Mon, 30 Jun 2025 16:15:15 +0200 Subject: [PATCH] relaxng: Make xmlRelaxNGDump depend on debug option --- codegen/xmlmod.py | 2 +- include/libxml/relaxng.h | 4 +++- relaxng.c | 4 +++- testapi.c | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/codegen/xmlmod.py b/codegen/xmlmod.py index a18422b5..de4ee0de 100644 --- a/codegen/xmlmod.py +++ b/codegen/xmlmod.py @@ -72,13 +72,13 @@ symbolMap2 = { 'xmlXPathDebugDumpCompExpr': 'DEBUG', 'xmlXPathDebugDumpObject': 'DEBUG', 'xmlSchemaDump': 'DEBUG', + 'xmlRelaxNGDump': 'DEBUG', 'xmlACatalogDump': 'OUTPUT', 'xmlCatalogDump': 'OUTPUT', 'xmlIOHTTPOpenW': 'OUTPUT', 'xmlNanoHTTPSave': 'OUTPUT', 'xmlRegisterHTTPPostCallbacks': 'OUTPUT', - 'xmlRelaxNGDump': 'OUTPUT', 'xmlRelaxNGDumpTree': 'OUTPUT', 'xmlTextReaderPreservePattern': 'PATTERN', diff --git a/include/libxml/relaxng.h b/include/libxml/relaxng.h index 2a142c71..e6161853 100644 --- a/include/libxml/relaxng.h +++ b/include/libxml/relaxng.h @@ -161,10 +161,12 @@ XMLPUBFUN xmlRelaxNG * xmlRelaxNGParse (xmlRelaxNGParserCtxt *ctxt); XMLPUBFUN void xmlRelaxNGFree (xmlRelaxNG *schema); -#ifdef LIBXML_OUTPUT_ENABLED +#ifdef LIBXML_DEBUG_ENABLED XMLPUBFUN void xmlRelaxNGDump (FILE *output, xmlRelaxNG *schema); +#endif /* LIBXML_DEBUG_ENABLED */ +#ifdef LIBXML_OUTPUT_ENABLED XMLPUBFUN void xmlRelaxNGDumpTree (FILE * output, xmlRelaxNG *schema); diff --git a/relaxng.c b/relaxng.c index f65f854a..05581aa1 100644 --- a/relaxng.c +++ b/relaxng.c @@ -7466,7 +7466,7 @@ xmlRelaxNGSetResourceLoader(xmlRelaxNGParserCtxt *ctxt, ctxt->resourceCtxt = vctxt; } -#ifdef LIBXML_OUTPUT_ENABLED +#ifdef LIBXML_DEBUG_ENABLED /************************************************************************ * * @@ -7677,7 +7677,9 @@ xmlRelaxNGDump(FILE * output, xmlRelaxNG *schema) } xmlRelaxNGDumpGrammar(output, schema->topgrammar, 1); } +#endif /* LIBXML_DEBUG_ENABLED */ +#ifdef LIBXML_OUTPUT_ENABLED /** * Dump the transformed RelaxNG tree. * diff --git a/testapi.c b/testapi.c index 6ed0c38a..059836e7 100644 --- a/testapi.c +++ b/testapi.c @@ -977,8 +977,10 @@ main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { xmlRelaxNGValidatePushCData(NULL, NULL, 0); xmlRelaxNGValidatePushElement(NULL, NULL, NULL); xmlRelaxParserSetFlag(NULL, 0); -#ifdef LIBXML_OUTPUT_ENABLED +#ifdef LIBXML_DEBUG_ENABLED xmlRelaxNGDump(NULL, NULL); +#endif /* LIBXML_DEBUG_ENABLED */ +#ifdef LIBXML_OUTPUT_ENABLED xmlRelaxNGDumpTree(NULL, NULL); #endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_RELAXNG_ENABLED */