From d6812f3a48013c30fcb39a0333295ed2230f3e22 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Thu, 14 Dec 2023 13:35:13 +0100
Subject: [PATCH] Fix compiler warnings with disabled modules

---
 python/libxml.c | 20 ++++++++------------
 xmllint.c       |  4 ++--
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/python/libxml.c b/python/libxml.c
index 18d0f86a..8e4d9982 100644
--- a/python/libxml.c
+++ b/python/libxml.c
@@ -348,6 +348,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) {
     return(lenread);
 }
 
+#ifdef LIBXML_OUTPUT_ENABLED
 /**
  * xmlFileWrite:
  * @context:  the I/O context
@@ -392,6 +393,7 @@ xmlPythonFileWrite (void * context, const char * buffer, int len) {
     }
     return(written);
 }
+#endif /* LIBXML_OUTPUT_ENABLED */
 
 /**
  * xmlPythonFileClose:
@@ -1364,11 +1366,11 @@ libxml_xmlCreatePushParser(ATTRIBUTE_UNUSED PyObject * self,
     return (pyret);
 }
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
 libxml_htmlCreatePushParser(ATTRIBUTE_UNUSED PyObject * self,
                             PyObject * args)
 {
-#ifdef LIBXML_HTML_ENABLED
     const char *chunk;
     int size;
     const char *URI;
@@ -1391,16 +1393,13 @@ libxml_htmlCreatePushParser(ATTRIBUTE_UNUSED PyObject * self,
                                    XML_CHAR_ENCODING_NONE);
     pyret = libxml_xmlParserCtxtPtrWrap(ret);
     return (pyret);
-#else
-    Py_INCREF(Py_None);
-    return (Py_None);
-#endif /* LIBXML_HTML_ENABLED */
 }
+#endif /* LIBXML_HTML_ENABLED */
 
+#ifdef LIBXML_SAX1_ENABLED
 PyObject *
 libxml_xmlSAXParseFile(ATTRIBUTE_UNUSED PyObject * self, PyObject * args)
 {
-#ifdef LIBXML_SAX1_ENABLED
     int recover;
     const char *URI;
     PyObject *pyobj_SAX = NULL;
@@ -1421,15 +1420,15 @@ libxml_xmlSAXParseFile(ATTRIBUTE_UNUSED PyObject * self, PyObject * args)
     ctxt = xmlNewSAXParserCtxt(SAX, pyobj_SAX);
     xmlCtxtReadFile(ctxt, URI, NULL, 0);
     xmlFreeParserCtxt(ctxt);
-#endif /* LIBXML_SAX1_ENABLED */
     Py_INCREF(Py_None);
     return (Py_None);
 }
+#endif /* LIBXML_SAX1_ENABLED */
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
 libxml_htmlSAXParseFile(ATTRIBUTE_UNUSED PyObject * self, PyObject * args)
 {
-#ifdef LIBXML_HTML_ENABLED
     const char *URI;
     const char *encoding;
     PyObject *pyobj_SAX = NULL;
@@ -1453,11 +1452,8 @@ libxml_htmlSAXParseFile(ATTRIBUTE_UNUSED PyObject * self, PyObject * args)
     htmlFreeParserCtxt(ctxt);
     Py_INCREF(Py_None);
     return (Py_None);
-#else
-    Py_INCREF(Py_None);
-    return (Py_None);
-#endif /* LIBXML_HTML_ENABLED */
 }
+#endif /* LIBXML_HTML_ENABLED */
 
 /************************************************************************
  *									*
diff --git a/xmllint.c b/xmllint.c
index 21dbe7d2..5f99d0a0 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -2013,10 +2013,10 @@ static void walkDoc(xmlDocPtr doc) {
 static void doXPathDump(xmlXPathObjectPtr cur) {
     switch(cur->type) {
         case XPATH_NODESET: {
-            int i;
-            xmlNodePtr node;
 #ifdef LIBXML_OUTPUT_ENABLED
             xmlOutputBufferPtr buf;
+            xmlNodePtr node;
+            int i;
 
             if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr <= 0)) {
                 if (!quiet) {