Added a macro for XML child node iterations to make the code more terse and easier to read.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/configuration.cpp b/src/configuration.cpp
index 8bb0b8ca..d33df386 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -30,6 +30,7 @@
 #include "log.h"
 
 #include "utils/tostring.h"
+#include "utils/xml.h"
 
 void Configuration::init(const std::string &filename)
 {
@@ -48,14 +49,14 @@ void Configuration::init(const std::string &filename)
 
     if (!doc) return;
 
-    xmlNodePtr node = xmlDocGetRootElement(doc);
+    xmlNodePtr rootNode = xmlDocGetRootElement(doc);
 
-    if (!node || !xmlStrEqual(node->name, BAD_CAST "configuration")) {
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "configuration")) {
         logger->log("Warning: No configuration file (%s)", filename.c_str());
         return;
     }
 
-    for (node = node->xmlChildrenNode; node != NULL; node = node->next)
+    for_each_xml_child_node(node, rootNode)
     {
         if (!xmlStrEqual(node->name, BAD_CAST "option"))
             continue;