diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-01-10 21:06:33 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-01-10 21:06:33 +0300 |
commit | 5edddb1313ed0dc275e6ae70b8a1780ded3a590d (patch) | |
tree | fffa478013e8f3622c4e7f85eeb71609cb352322 /src/configuration.cpp | |
parent | a057817a0983b3a3190f6773101f788f2c6278ba (diff) | |
download | mv-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.gz mv-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.bz2 mv-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.xz mv-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.zip |
Replace xmlStrEqual to xmlNameEqual.
Diffstat (limited to 'src/configuration.cpp')
-rw-r--r-- | src/configuration.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp index 957fa1798..b3d5d77d0 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -432,7 +432,7 @@ void ConfigurationObject::initFromXML(XmlNodePtr parent_node) for_each_xml_child_node(node, parent_node) { - if (xmlStrEqual(node->name, BAD_CAST "list")) + if (xmlNameEqual(node, "list")) { // list option handling @@ -440,7 +440,7 @@ void ConfigurationObject::initFromXML(XmlNodePtr parent_node) for_each_xml_child_node(subnode, node) { - if (xmlStrEqual(subnode->name, BAD_CAST name.c_str()) + if (xmlNameEqual(subnode, name.c_str()) && subnode->type == XML_ELEMENT_NODE) { ConfigurationObject *cobj = new ConfigurationObject; @@ -452,7 +452,7 @@ void ConfigurationObject::initFromXML(XmlNodePtr parent_node) } } - else if (xmlStrEqual(node->name, BAD_CAST "option")) + else if (xmlNameEqual(node, "option")) { // single option handling @@ -491,7 +491,7 @@ void Configuration::init(const std::string &filename, bool useResManager) XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "configuration")) + if (!rootNode || !xmlNameEqual(rootNode, "configuration")) { logger->log("Warning: No configuration file (%s)", filename.c_str()); return; |