diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-01-10 18:43:15 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-01-10 18:43:15 +0300 |
commit | bad730dd0de24b2b17b91922c0c7f2b31b7b4d9b (patch) | |
tree | 06c1d723a051b57cc4c107df1d7bb00296dbe99b /src/utils/xml.cpp | |
parent | 08dc59e8bff25736d15d11313e0296f60e248e0a (diff) | |
download | mv-bad730dd0de24b2b17b91922c0c7f2b31b7b4d9b.tar.gz mv-bad730dd0de24b2b17b91922c0c7f2b31b7b4d9b.tar.bz2 mv-bad730dd0de24b2b17b91922c0c7f2b31b7b4d9b.tar.xz mv-bad730dd0de24b2b17b91922c0c7f2b31b7b4d9b.zip |
Move libxml2 includes to xml.h
Diffstat (limited to 'src/utils/xml.cpp')
-rw-r--r-- | src/utils/xml.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 87833d176..5a9558cc2 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -32,6 +32,11 @@ #include "debug.h" +static void xmlNullLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...) +{ + // Does nothing, that's the whole point of it +} + namespace XML { Document::Document(const std::string &filename, bool useResman): @@ -165,4 +170,15 @@ namespace XML return nullptr; } + // Initialize libxml2 and check for potential ABI mismatches between + // compiled version and the shared library actually used. + void initXML() + { + xmlInitParser(); + LIBXML_TEST_VERSION; + + // Suppress libxml2 error messages + xmlSetGenericErrorFunc(nullptr, xmlNullLogger); + } + } // namespace XML |