Merge pull request #805 from g-maxime/deprecated

JeromeMartinez · web-flow · commit b73a4a685ff4 · 2025-06-22T23:45:48.000+02:00
Remove / replace use of deprecated libxml2 functions
diff --git a/Source/CLI/CLI.cpp b/Source/CLI/CLI.cpp
@@ -124,7 +124,7 @@ void __stdcall Event_CallBackFunction(unsigned char* Data_Content, size_t Data_S
 
     //--------------------------------------------------------------------------
     CLI::CLI() : watch_folder_user(NULL), use_as_user(-1), use_daemon(false), asynchronous(false),
-                 force_analyze(false), full_report(false), no_database(false), include_hidden_files(false), mil_analyze(true),
+                 force_analyze(false), no_database(false), full_report(false), include_hidden_files(false), mil_analyze(true),
                  watch_folder_recursive(true), create_policy_mode(false), file_information(false),
                  plugins_list_mode(false), list_watch_folders_mode(false), no_needs_files_mode(false),
                  list_mode(false), fixer(false)
diff --git a/Source/Checker/Checker.cpp b/Source/Checker/Checker.cpp
@@ -118,15 +118,15 @@ int tfsxml_hasvalue(tfsxml_string* priv)
 }
 
 //---------------------------------------------------------------------------
-std::string tokenize(const std::string& scope, const std::string& list, const std::string& delimiter)
+std::string tokenize(const std::string& scope, const std::string& list, const char delimiter)
 {
     std::stringstream ss;
 
     //TODO: mmt
     if (scope.empty() || scope=="mi")
     {
         std::istringstream iss(list);
-        for (std::string token; std::getline(iss, token, '/');)
+        for (std::string token; std::getline(iss, token, delimiter);)
             ss << "/mi:" << token;
     }
 
@@ -280,7 +280,7 @@ std::string PolicyChecker::PolicyElement::to_string(size_t level, bool verbose)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-PolicyChecker::RuleElement::RuleElement() : resolved(false), pass(false), tracks(0), source(NULL)
+PolicyChecker::RuleElement::RuleElement() : source(NULL), tracks(0), resolved(false), pass(false)
 {
 }
 
@@ -624,7 +624,7 @@ PolicyChecker::RuleElement* PolicyChecker::parse_rule(tfsxml_string& tfsxml_priv
                            << rule->source->tracktype << "']["
                            << ((rule->source->occurrence.empty() || rule->source->occurrence=="all" || rule->source->occurrence=="any") ? "*" : rule->source->occurrence)
                            << "]"
-                           << tokenize(rule->source->scope, rule->source->field, "/");
+                           << tokenize(rule->source->scope, rule->source->field, '/');
                         rule->source->path=parse_path(ss.str());
                     }
                     break;
@@ -650,7 +650,7 @@ PolicyChecker::RuleElement* PolicyChecker::parse_rule(tfsxml_string& tfsxml_priv
            << rule->tracktype
            << "']["
            << ((rule->occurrence.empty() || rule->occurrence=="all" || rule->occurrence=="any") ? "*" : rule->occurrence)
-           << "]" << tokenize(rule->scope, rule->field, "/");
+           << "]" << tokenize(rule->scope, rule->field, '/');
         rule->xpath=ss.str();
         rule->path=parse_path(rule->xpath);
     }
diff --git a/Source/Checker/Checker.h b/Source/Checker/Checker.h
@@ -47,14 +47,14 @@ class PolicyChecker
     class Element
     {
     public:
-        typedef enum Level {
+        enum Level {
             LEVEL_NONE = 0,
             LEVEL_INFO,
             LEVEL_WARN,
             LEVEL_FAIL,
         };
 
-        typedef enum Result {
+        enum Result {
             RESULT_PASS = 0,
             RESULT_INFO,
             RESULT_WARN,
diff --git a/Source/Checker/Path.cpp b/Source/Checker/Path.cpp
@@ -113,7 +113,6 @@ std::vector<PathElement> parse_path(const std::string& xpath)
 bool path_is_matching(tfsxml_string& tfsxml_priv, tfsxml_string& node, PathElement path, size_t& occurrence)
 {
     tfsxml_string tfsxml_priv_local = tfsxml_priv;
-    tfsxml_string value;
 
     // compare names
     if (tfsxml_strcmp_charp(node, path.name.c_str()))
diff --git a/Source/Common/Core.cpp b/Source/Common/Core.cpp
@@ -506,7 +506,7 @@ long Core::checker_analyze(int user, const std::string& filename, long src_id, s
 }
 
 //--------------------------------------------------------------------------
-int Core::checker_list_mediainfo_outputs(std::string& output, std::string& err)
+int Core::checker_list_mediainfo_outputs(std::string& output, std::string&)
 {
     output = Ztring(MI->Option(__T("Info_OutputFormats_JSON"))).To_UTF8();
 
@@ -980,7 +980,7 @@ int Core::transform_mixml_report(const std::string& mi_xml, const std::string& m
     }
 
     tmpMI->Open_Buffer_Init(BufferSize);
-    tmpMI->Open_Buffer_Continue((ZenLib::int8u*)mi_xml.data(), BufferSize);
+    tmpMI->Open_Buffer_Continue((const ZenLib::int8u*)mi_xml.data(), BufferSize);
     tmpMI->Open_Buffer_Finalize();
 
     report = Ztring(tmpMI->Inform()).To_UTF8();
@@ -1697,10 +1697,10 @@ unsigned long long Core::mil_version()
         build = strtol(version, &end, 10);
     }
 
-    return ((unsigned long long )major << 52) & 0xFFF0000000000000 |
-           ((unsigned long long )minor << 40) & 0x000FFF0000000000 |
-           ((unsigned long long )patch << 32) & 0x000000FF00000000 |
-           ((unsigned long long )build)       & 0x00000000FFFFFFFF;
+    return (((unsigned long long )major << 52) & 0xFFF0000000000000) |
+           (((unsigned long long )minor << 40) & 0x000FFF0000000000) |
+           (((unsigned long long )patch << 32) & 0x000000FF00000000) |
+           (((unsigned long long )build)       & 0x00000000FFFFFFFF);
 }
 
 //--------------------------------------------------------------------------
diff --git a/Source/Common/Policy.cpp b/Source/Common/Policy.cpp
@@ -95,7 +95,6 @@ int Policy::import_schema(const std::string& filename, const std::string& save_n
 
     int ret = import_schema_from_doc(doc, save_name);
     xmlFreeDoc(doc);
-    xmlCleanupCharEncodingHandlers();
     xmlSetGenericErrorFunc(NULL, NULL);
     return ret;
 }
diff --git a/Source/Common/Scheduler.cpp b/Source/Common/Scheduler.cpp
@@ -42,7 +42,7 @@ namespace MediaConch {
     //***************************************************************************
 
     //---------------------------------------------------------------------------
-    Scheduler::Scheduler(Core* c) : core(c), max_threads_modified(false), max_threads(1)
+    Scheduler::Scheduler(Core* c) : core(c), max_threads(1), max_threads_modified(false)
     {
         queue = new Queue(this);
     }
diff --git a/Source/Common/Scheduler.h b/Source/Common/Scheduler.h
@@ -72,7 +72,7 @@ class Scheduler
     void write_log_timestamp(int level, std::string log);
     void log_cb(struct MediaInfo_Event_Log_0 *Event);
 
-    void set_default_max_threads(size_t nb) {} // { if (max_threads_modified) return; max_threads = nb; } //TODO: check issues with the GUI when there are tons of files
+    void set_default_max_threads(size_t /* nb */) {} // { if (max_threads_modified) return; max_threads = nb; } //TODO: check issues with the GUI when there are tons of files
     void set_max_threads(size_t nb) { max_threads_modified = true; max_threads = nb; }
 
 private:
diff --git a/Source/Common/Xslt.cpp b/Source/Common/Xslt.cpp
@@ -74,7 +74,6 @@ bool Xslt::register_schema_from_doc(void* data)
         return false;
 
     xsltSetGenericErrorFunc(this, &manage_generic_error);
-    xmlLoadExtDtdDefaultValue = 1;
 
     if (xslt_ctx)
     {
@@ -100,7 +99,6 @@ bool Xslt::register_schema_from_doc(void* data)
 //---------------------------------------------------------------------------
 bool Xslt::register_schema_from_memory(const std::string& schem)
 {
-    xmlLoadExtDtdDefaultValue = 1;
     xmlSetGenericErrorFunc(this, &manage_generic_error);
 
     int doc_flags = XML_PARSE_COMPACT | XML_PARSE_DTDLOAD;
@@ -135,10 +133,7 @@ int Xslt::validate_xml(const std::string& xml, bool)
     if (!xslt_ctx)
         return -1;
 
-    xmlSubstituteEntitiesDefault(1);
-    xmlLoadExtDtdDefaultValue = 1;
-
-    int doc_flags = XML_PARSE_COMPACT | XML_PARSE_DTDLOAD;
+    int doc_flags = XML_PARSE_COMPACT | XML_PARSE_DTDLOAD | XML_PARSE_NOENT;
     xmlSetGenericErrorFunc(this, &manage_generic_error);
 
 #ifdef XML_PARSE_BIG_LINES
diff --git a/Source/IMSC1/IMSC1Plugin.cpp b/Source/IMSC1/IMSC1Plugin.cpp
@@ -81,7 +81,7 @@ namespace MediaConch {
     }
 
     //---------------------------------------------------------------------------
-    int IMSC1Plugin::create_report(std::string& report, const std::string& filename, bool result, const std::string& message, std::string& error)
+    int IMSC1Plugin::create_report(std::string& report, const std::string& filename, bool result, const std::string& message, std::string&)
     {
 
         xmlDocPtr doc = xmlNewDoc((const xmlChar *)"1.0");
@@ -348,7 +348,7 @@ namespace MediaConch {
     }
 
     //---------------------------------------------------------------------------
-    void IMSC1Plugin::xml_error_discard(void* user_data, const char* format, ...)
+    void IMSC1Plugin::xml_error_discard(void*, const char*, ...)
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,15 +118,15 @@ int tfsxml_hasvalue(tfsxml_string* priv)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`//---------------------------------------------------------------------------`
`121`		`-std::string tokenize(const std::string& scope, const std::string& list, const std::string& delimiter)`
	`121`	`+std::string tokenize(const std::string& scope, const std::string& list, const char delimiter)`
`122`	`122`	`{`
`123`	`123`	`std::stringstream ss;`
`124`	`124`
`125`	`125`	`//TODO: mmt`
`126`	`126`	`if (scope.empty() \|\| scope=="mi")`
`127`	`127`	`{`
`128`	`128`	`std::istringstream iss(list);`
`129`		`- for (std::string token; std::getline(iss, token, '/');)`
	`129`	`+ for (std::string token; std::getline(iss, token, delimiter);)`
`130`	`130`	`ss << "/mi:" << token;`
`131`	`131`	`}`
`132`	`132`
`@@ -280,7 +280,7 @@ std::string PolicyChecker::PolicyElement::to_string(size_t level, bool verbose)`
`280`	`280`	`//---------------------------------------------------------------------------`
`281`	`281`
`282`	`282`	`//---------------------------------------------------------------------------`
`283`		`-PolicyChecker::RuleElement::RuleElement() : resolved(false), pass(false), tracks(0), source(NULL)`
	`283`	`+PolicyChecker::RuleElement::RuleElement() : source(NULL), tracks(0), resolved(false), pass(false)`
`284`	`284`	`{`
`285`	`285`	`}`
`286`	`286`
`@@ -624,7 +624,7 @@ PolicyChecker::RuleElement* PolicyChecker::parse_rule(tfsxml_string& tfsxml_priv`
`624`	`624`	`<< rule->source->tracktype << "']["`
`625`	`625`	`<< ((rule->source->occurrence.empty() \|\| rule->source->occurrence=="all" \|\| rule->source->occurrence=="any") ? "*" : rule->source->occurrence)`
`626`	`626`	`<< "]"`
`627`		`- << tokenize(rule->source->scope, rule->source->field, "/");`
	`627`	`+ << tokenize(rule->source->scope, rule->source->field, '/');`
`628`	`628`	`rule->source->path=parse_path(ss.str());`
`629`	`629`	`}`
`630`	`630`	`break;`
`@@ -650,7 +650,7 @@ PolicyChecker::RuleElement* PolicyChecker::parse_rule(tfsxml_string& tfsxml_priv`
`650`	`650`	`<< rule->tracktype`
`651`	`651`	`<< "']["`
`652`	`652`	`<< ((rule->occurrence.empty() \|\| rule->occurrence=="all" \|\| rule->occurrence=="any") ? "*" : rule->occurrence)`
`653`		`- << "]" << tokenize(rule->scope, rule->field, "/");`
	`653`	`+ << "]" << tokenize(rule->scope, rule->field, '/');`
`654`	`654`	`rule->xpath=ss.str();`
`655`	`655`	`rule->path=parse_path(rule->xpath);`
`656`	`656`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ std::vector<PathElement> parse_path(const std::string& xpath)`
`113`	`113`	`bool path_is_matching(tfsxml_string& tfsxml_priv, tfsxml_string& node, PathElement path, size_t& occurrence)`
`114`	`114`	`{`
`115`	`115`	`tfsxml_string tfsxml_priv_local = tfsxml_priv;`
`116`		`- tfsxml_string value;`
`117`	`116`
`118`	`117`	`// compare names`
`119`	`118`	`if (tfsxml_strcmp_charp(node, path.name.c_str()))`
Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ long Core::checker_analyze(int user, const std::string& filename, long src_id, s`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`//--------------------------------------------------------------------------`
`509`		`-int Core::checker_list_mediainfo_outputs(std::string& output, std::string& err)`
	`509`	`+int Core::checker_list_mediainfo_outputs(std::string& output, std::string&)`
`510`	`510`	`{`
`511`	`511`	`output = Ztring(MI->Option(__T("Info_OutputFormats_JSON"))).To_UTF8();`
`512`	`512`
`@@ -980,7 +980,7 @@ int Core::transform_mixml_report(const std::string& mi_xml, const std::string& m`
`980`	`980`	`}`
`981`	`981`
`982`	`982`	`tmpMI->Open_Buffer_Init(BufferSize);`
`983`		`- tmpMI->Open_Buffer_Continue((ZenLib::int8u*)mi_xml.data(), BufferSize);`
	`983`	`+ tmpMI->Open_Buffer_Continue((const ZenLib::int8u*)mi_xml.data(), BufferSize);`
`984`	`984`	`tmpMI->Open_Buffer_Finalize();`
`985`	`985`
`986`	`986`	`report = Ztring(tmpMI->Inform()).To_UTF8();`
`@@ -1697,10 +1697,10 @@ unsigned long long Core::mil_version()`
`1697`	`1697`	`build = strtol(version, &end, 10);`
`1698`	`1698`	`}`
`1699`	`1699`
`1700`		`- return ((unsigned long long )major << 52) & 0xFFF0000000000000 \|`
`1701`		`- ((unsigned long long )minor << 40) & 0x000FFF0000000000 \|`
`1702`		`- ((unsigned long long )patch << 32) & 0x000000FF00000000 \|`
`1703`		`- ((unsigned long long )build) & 0x00000000FFFFFFFF;`
	`1700`	`+ return (((unsigned long long )major << 52) & 0xFFF0000000000000) \|`
	`1701`	`+ (((unsigned long long )minor << 40) & 0x000FFF0000000000) \|`
	`1702`	`+ (((unsigned long long )patch << 32) & 0x000000FF00000000) \|`
	`1703`	`+ (((unsigned long long )build) & 0x00000000FFFFFFFF);`
`1704`	`1704`	`}`
`1705`	`1705`
`1706`	`1706`	`//--------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ int Policy::import_schema(const std::string& filename, const std::string& save_n`
`95`	`95`
`96`	`96`	`int ret = import_schema_from_doc(doc, save_name);`
`97`	`97`	`xmlFreeDoc(doc);`
`98`		`- xmlCleanupCharEncodingHandlers();`
`99`	`98`	`xmlSetGenericErrorFunc(NULL, NULL);`
`100`	`99`	`return ret;`
`101`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ namespace MediaConch {`
`42`	`42`	`//***************************************************************************`
`43`	`43`
`44`	`44`	`//---------------------------------------------------------------------------`
`45`		`- Scheduler::Scheduler(Core* c) : core(c), max_threads_modified(false), max_threads(1)`
	`45`	`+ Scheduler::Scheduler(Core* c) : core(c), max_threads(1), max_threads_modified(false)`
`46`	`46`	`{`
`47`	`47`	`queue = new Queue(this);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ namespace MediaConch {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`//---------------------------------------------------------------------------`
`84`		`- int IMSC1Plugin::create_report(std::string& report, const std::string& filename, bool result, const std::string& message, std::string& error)`
	`84`	`+ int IMSC1Plugin::create_report(std::string& report, const std::string& filename, bool result, const std::string& message, std::string&)`
`85`	`85`	`{`
`86`	`86`
`87`	`87`	`xmlDocPtr doc = xmlNewDoc((const xmlChar *)"1.0");`
`@@ -348,7 +348,7 @@ namespace MediaConch {`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`//---------------------------------------------------------------------------`
`351`		`- void IMSC1Plugin::xml_error_discard(void* user_data, const char* format, ...)`
	`351`	`+ void IMSC1Plugin::xml_error_discard(void, const char, ...)`
`352`	`352`	`{`
`353`	`353`	`}`
`354`	`354`	`}`