lib: correct BoolString initialization

bareos · Dec 15, 2020 · b16a693 · b16a693
1 parent ba42499
commit b16a693
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 32 deletions.
diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -100,7 +100,6 @@ set(BAREOS_SRCS
     bnet.cc
     bnet_network_dump.cc
     bnet_network_dump_private.cc
-    bool_string.cc
     bpipe.cc
     breg.cc
     bregex.cc

diff --git a/core/src/lib/bool_string.cc b/core/src/lib/bool_string.cc
diff --git a/core/src/lib/bool_string.h b/core/src/lib/bool_string.h
@@ -28,7 +28,7 @@
 
 class BoolString {
  public:
-  BoolString(const std::string& s) : str_value(s)
+  explicit BoolString(const std::string& s) : str_value(s)
   {
     if (true_values.find(str_value) == true_values.end()
         && false_values.find(str_value) == false_values.end()) {
@@ -44,8 +44,8 @@ class BoolString {
 
  private:
   std::string str_value;
-  static const std::set<std::string> true_values;
-  static const std::set<std::string> false_values;
+  const std::set<std::string> true_values{"true", "yes", "1"};
+  const std::set<std::string> false_values{"false", "no", "0"};
 };
 
 template <>

diff --git a/core/src/tests/bool_string.cc b/core/src/tests/bool_string.cc
@@ -35,8 +35,8 @@
 TEST(BoolString, convert_supported_bool_strings)
 {
   const std::map<std::string, bool> test_pattern{
-      {"on", true},   {"true", true},   {"yes", true}, {"1", true},
-      {"off", false}, {"false", false}, {"no", false}, {"0", false}};
+      {"true", true},   {"yes", true}, {"1", true},
+      {"false", false}, {"no", false}, {"0", false}};
 
   for (const auto& t : test_pattern) {
     bool value = false;