Centralized stringToBool conversion.

Also moved the trim() function into the utils namespace
where it belongs more, and made some random code cleanups.

Reviewed-by: Thorbjorn.

2 files changed, 21 insertions, 3 deletions

diff --git a/src/common/configuration.cpp b/src/common/configuration.cpp
index 0f0a584..a0e2ab2 100644
--- a/src/common/configuration.cpp
+++ b/src/common/configuration.cpp
@@ -27,6 +27,7 @@
 
 #include "utils/logger.h"
 #include "utils/xml.hpp"
+#include "utils/string.hpp"
 
 /**< Persistent configuration. */
 static std::map< std::string, std::string > options;
@@ -78,13 +79,23 @@ std::string Configuration::getValue(const std::string &key,
                                     const std::string &deflt)
 {
     std::map<std::string, std::string>::iterator iter = options.find(key);
-    if (iter == options.end()) return deflt;
+    if (iter == options.end())
+        return deflt;
     return iter->second;
 }
 
 int Configuration::getValue(const std::string &key, int deflt)
 {
     std::map<std::string, std::string>::iterator iter = options.find(key);
-    if (iter == options.end()) return deflt;
+    if (iter == options.end())
+        return deflt;
     return atoi(iter->second.c_str());
 }
+
+bool Configuration::getBoolValue(const std::string &key, bool deflt)
+{
+    std::map<std::string, std::string>::iterator iter = options.find(key);
+    if (iter == options.end())
+        return deflt;
+    return utils::stringToBool(iter->second.c_str(), deflt);
+}
diff --git a/src/common/configuration.hpp b/src/common/configuration.hpp
index 0627c29..dbb0a7d 100644
--- a/src/common/configuration.hpp
+++ b/src/common/configuration.hpp
@@ -43,11 +43,18 @@ namespace Configuration
     std::string getValue(const std::string &key, const std::string &deflt);
 
     /**
-     * Gets an option as a string.
+     * Gets an option as an integer.
      * @param key option identifier.
      * @param deflt default value.
      */
     int getValue(const std::string &key, int deflt);
+
+    /**
+     * Gets an option as a boolean.
+     * @param key option identifier.
+     * @param deflt default value.
+     */
+    bool getBoolValue(const std::string &key, bool deflt);
 }
 
 #ifndef DEFAULT_SERVER_PORT