summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-10 19:02:55 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-10 19:22:29 +0300
commita057817a0983b3a3190f6773101f788f2c6278ba (patch)
tree456ea8c5478139889748bdfdb62560c9b7535718
parent793a119a7a36f9680dad108e75075c8c4bd4a0d0 (diff)
downloadmanaverse-a057817a0983b3a3190f6773101f788f2c6278ba.tar.gz
manaverse-a057817a0983b3a3190f6773101f788f2c6278ba.tar.bz2
manaverse-a057817a0983b3a3190f6773101f788f2c6278ba.tar.xz
manaverse-a057817a0983b3a3190f6773101f788f2c6278ba.zip
Move clieanup for libxml2 to xml.cpp
-rw-r--r--src/client.cpp3
-rw-r--r--src/utils/xml.cpp6
-rw-r--r--src/utils/xml.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 88fe8c443..0f82a4514 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -741,8 +741,7 @@ void Client::gameClear()
if (logger)
logger->log1("Quitting4");
- // Shutdown libxml
- xmlCleanupParser();
+ XML::cleanupXML();
if (logger)
logger->log1("Quitting5");
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index d1df63510..9d6858d9d 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -181,4 +181,10 @@ namespace XML
xmlSetGenericErrorFunc(nullptr, xmlNullLogger);
}
+ // Shutdown libxml
+ void cleanupXML()
+ {
+ xmlCleanupParser();
+ }
+
} // namespace XML
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 849bc2060..fac90c63d 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -100,6 +100,8 @@ namespace XML
XmlNodePtr findFirstChildByName(XmlNodePtr parent, const char *name);
void initXML();
+
+ void cleanupXML();
}
#define for_each_xml_child_node(var, parent) \