[libxml2] Remove "runtime debugging"



commit 59f2f60e3eff07324f1c7cd861a444d714be750b
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Fri Sep 2 00:27:57 2022 +0200

    Remove "runtime debugging"
    
    This doesn't seem useful as configuration option.

 CMakeLists.txt                 | 3 +--
 configure.ac                   | 8 --------
 include/libxml/xmlversion.h.in | 4 ++--
 parser.c                       | 4 ----
 tree.c                         | 5 -----
 win32/configure.js             | 8 --------
 6 files changed, 3 insertions(+), 29 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 730aec72..175a5403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,6 @@ option(LIBXML2_WITH_PUSH "Add the PUSH parser interfaces" ON)
 option(LIBXML2_WITH_PYTHON "Build Python bindings" ON)
 option(LIBXML2_WITH_READER "Add the xmlReader parsing interface" ON)
 option(LIBXML2_WITH_REGEXPS "Add Regular Expressions support" ON)
-option(LIBXML2_WITH_RUN_DEBUG "Add the runtime debugging module" OFF)
 option(LIBXML2_WITH_SAX1 "Add the older SAX1 interface" ON)
 option(LIBXML2_WITH_SCHEMAS "Add Relax-NG and Schemas support" ON)
 option(LIBXML2_WITH_SCHEMATRON "Add Schematron support" ON)
@@ -97,7 +96,7 @@ if(LIBXML2_WITH_ZLIB)
        find_package(ZLIB REQUIRED)
 endif()
 
-foreach(VARIABLE IN ITEMS WITH_AUTOMATA WITH_C14N WITH_CATALOG WITH_DEBUG WITH_EXPR WITH_FTP WITH_HTML 
WITH_HTTP WITH_ICONV WITH_ICU WITH_ISO8859X WITH_LEGACY WITH_LZMA WITH_MEM_DEBUG WITH_MODULES WITH_OUTPUT 
WITH_PATTERN WITH_PUSH WITH_READER WITH_REGEXPS WITH_RUN_DEBUG WITH_SAX1 WITH_SCHEMAS WITH_SCHEMATRON 
WITH_THREADS WITH_THREAD_ALLOC WITH_TREE WITH_TRIO WITH_UNICODE WITH_VALID WITH_WRITER WITH_XINCLUDE 
WITH_XPATH WITH_XPTR WITH_XPTR_LOCS WITH_ZLIB)
+foreach(VARIABLE IN ITEMS WITH_AUTOMATA WITH_C14N WITH_CATALOG WITH_DEBUG WITH_EXPR WITH_FTP WITH_HTML 
WITH_HTTP WITH_ICONV WITH_ICU WITH_ISO8859X WITH_LEGACY WITH_LZMA WITH_MEM_DEBUG WITH_MODULES WITH_OUTPUT 
WITH_PATTERN WITH_PUSH WITH_READER WITH_REGEXPS WITH_SAX1 WITH_SCHEMAS WITH_SCHEMATRON WITH_THREADS 
WITH_THREAD_ALLOC WITH_TREE WITH_TRIO WITH_UNICODE WITH_VALID WITH_WRITER WITH_XINCLUDE WITH_XPATH WITH_XPTR 
WITH_XPTR_LOCS WITH_ZLIB)
        if(LIBXML2_${VARIABLE})
                set(${VARIABLE} 1)
        else()
diff --git a/configure.ac b/configure.ac
index 2a570e7d..d8919a2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -960,14 +960,6 @@ else
 fi
 AC_SUBST(WITH_MEM_DEBUG)
 
-if test "$with_run_debug" = "yes" ; then
-    echo Enabling runtime debug support
-    WITH_RUN_DEBUG=1
-else
-    WITH_RUN_DEBUG=0
-fi
-AC_SUBST(WITH_RUN_DEBUG)
-
 dnl
 dnl check for python
 dnl
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index bdebfe3b..dfd3c30f 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -313,9 +313,9 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 /**
  * LIBXML_DEBUG_RUNTIME:
  *
- * Whether the runtime debugging is configured in
+ * Removed
  */
-#if @WITH_RUN_DEBUG@
+#if 0
 #define LIBXML_DEBUG_RUNTIME
 #endif
 
diff --git a/parser.c b/parser.c
index 0eb1af18..af0b1171 100644
--- a/parser.c
+++ b/parser.c
@@ -1057,11 +1057,7 @@ xmlHasFeature(xmlFeature feature)
             return(0);
 #endif
         case XML_WITH_DEBUG_RUN:
-#ifdef LIBXML_DEBUG_RUNTIME
-            return(1);
-#else
             return(0);
-#endif
         case XML_WITH_ZLIB:
 #ifdef LIBXML_ZLIB_ENABLED
             return(1);
diff --git a/tree.c b/tree.c
index 612c19fd..6a42f118 100644
--- a/tree.c
+++ b/tree.c
@@ -1216,11 +1216,6 @@ xmlFreeDoc(xmlDocPtr cur) {
 #endif
        return;
     }
-#ifdef LIBXML_DEBUG_RUNTIME
-#ifdef LIBXML_DEBUG_ENABLED
-    xmlDebugCheckDocument(stderr, cur);
-#endif
-#endif
 
     if (cur != NULL) dict = cur->dict;
 
diff --git a/win32/configure.js b/win32/configure.js
index 84994284..e53cfcb7 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -46,7 +46,6 @@ var withZlib = false;
 var withLzma = false;
 var withDebug = true;
 var withMemDebug = false;
-var withRunDebug = false;
 var withSchemas = true;
 var withSchematron = true;
 var withRegExps = true;
@@ -132,7 +131,6 @@ function usage()
        txt += "  lzma:       Enable lzma support (" + (withLzma? "yes" : "no")  + ")\n";
        txt += "  xml_debug:  Enable XML debbugging module (" + (withDebug? "yes" : "no")  + ")\n";
        txt += "  mem_debug:  Enable memory debugger (" + (withMemDebug? "yes" : "no")  + ")\n";
-       txt += "  run_debug:  Enable memory debugger (" + (withRunDebug? "yes" : "no")  + ")\n";
        txt += "  regexps:    Enable regular expressions (" + (withRegExps? "yes" : "no") + ")\n";
        txt += "  modules:    Enable module support (" + (withModules? "yes" : "no") + ")\n";
        txt += "  tree:       Enable tree api (" + (withTree? "yes" : "no") + ")\n";
@@ -229,7 +227,6 @@ function discoverVersion()
        vf.WriteLine("WITH_LZMA=" + (withLzma? "1" : "0"));
        vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0"));
        vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0"));
-       vf.WriteLine("WITH_RUN_DEBUG=" + (withRunDebug? "1" : "0"));
        vf.WriteLine("WITH_SCHEMAS=" + (withSchemas? "1" : "0"));
        vf.WriteLine("WITH_SCHEMATRON=" + (withSchematron? "1" : "0"));
        vf.WriteLine("WITH_REGEXPS=" + (withRegExps? "1" : "0"));
@@ -337,8 +334,6 @@ function configureLibxml()
                        of.WriteLine(s.replace(/\@WITH_DEBUG\@/, withDebug? "1" : "0"));
                } else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) {
                        of.WriteLine(s.replace(/\@WITH_MEM_DEBUG\@/, withMemDebug? "1" : "0"));
-               } else if (s.search(/\@WITH_RUN_DEBUG\@/) != -1) {
-                       of.WriteLine(s.replace(/\@WITH_RUN_DEBUG\@/, withRunDebug? "1" : "0"));
                } else if (s.search(/\@WITH_SCHEMAS\@/) != -1) {
                        of.WriteLine(s.replace(/\@WITH_SCHEMAS\@/, withSchemas? "1" : "0"));
                } else if (s.search(/\@WITH_SCHEMATRON\@/) != -1) {
@@ -492,8 +487,6 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
                        withDebug = strToBool(arg.substring(opt.length + 1, arg.length));
                else if (opt == "mem_debug")
                        withMemDebug = strToBool(arg.substring(opt.length + 1, arg.length));
-               else if (opt == "run_debug")
-                       withRunDebug = strToBool(arg.substring(opt.length + 1, arg.length));
                else if (opt == "schemas")
                        withSchemas = strToBool(arg.substring(opt.length + 1, arg.length));
                else if (opt == "schematron")
@@ -672,7 +665,6 @@ txtOut += "      zlib support: " + boolToStr(withZlib) + "\n";
 txtOut += "      lzma support: " + boolToStr(withLzma) + "\n";
 txtOut += "  Debugging module: " + boolToStr(withDebug) + "\n";
 txtOut += "  Memory debugging: " + boolToStr(withMemDebug) + "\n";
-txtOut += " Runtime debugging: " + boolToStr(withRunDebug) + "\n";
 txtOut += "    Regexp support: " + boolToStr(withRegExps) + "\n";
 txtOut += "    Module support: " + boolToStr(withModules) + "\n";
 txtOut += "      Tree support: " + boolToStr(withTree) + "\n";


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]