xml: teach xml_get_bool_text() correct bool parsing

Author: johanmalm

CMakeLists.txt

@@ -46,6 +46,7 @@ set(PROJECT_SOURCES
     src/xml.cpp src/xml.h
     src/find-themes.cpp src/find-themes.h
     src/pair.h
+    src/parse-bool.cpp src/parse-bool.h
 
     src/appearance.cpp src/appearance.h src/appearance.ui
     src/behaviour.cpp src/behaviour.h src/behaviour.ui
@@ -85,12 +86,12 @@ lxqt_translate_desktop(PROJECT_DESKTOP_FILES
 #===================================================================================================
 include(CTest)
 
-add_executable(t1000 tests/t1000-add-xpath-node.cpp tests/tap.cpp src/xml.cpp)
+add_executable(t1000 tests/t1000-add-xpath-node.cpp tests/tap.cpp src/xml.cpp src/parse-bool.cpp)
 target_link_libraries(t1000 PRIVATE ${GLIB_LDFLAGS} ${LIBXML2_LIBRARIES})
 target_include_directories(t1000 PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR})
 add_test(t1000 t1000)
 
-add_executable(t1001 tests/t1001-nodenames.cpp tests/tap.cpp)
+add_executable(t1001 tests/t1001-nodenames.cpp tests/tap.cpp src/parse-bool.cpp)
 target_link_libraries(t1001 PRIVATE ${GLIB_LDFLAGS} ${LIBXML2_LIBRARIES})
 target_include_directories(t1001 PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR})
 add_test(t1001 t1001)

src/parse-bool.cpp

@@ -0,0 +1,30 @@
+#include <cstring>
+#include "log.h"
+#include "parse-bool.h"
+
+int parseBool(const char *str, int defaultValue)
+{
+    if (!str)
+        goto error_not_a_boolean;
+    else if (!strcasecmp(str, "yes"))
+        return 1;
+    else if (!strcasecmp(str, "true"))
+        return 1;
+    else if (!strcasecmp(str, "on"))
+        return 1;
+    else if (!strcmp(str, "1"))
+        return 1;
+    else if (!strcasecmp(str, "no"))
+        return 0;
+    else if (!strcasecmp(str, "false"))
+        return 0;
+    else if (!strcasecmp(str, "off"))
+        return 0;
+    else if (!strcmp(str, "0"))
+        return 0;
+error_not_a_boolean:
+    warn("{} is not a boolean value", str);;
+    return defaultValue;
+}
+
+

src/parse-bool.h

@@ -0,0 +1,12 @@
+
+#pragma once
+
+/**
+ * parseBool() - Parse boolean value of string.
+ * @string: String to interpret. This check is case-insensitive.
+ * @default_value: Default value to use if string is not a recognised boolean.
+ *                 Use -1 to avoid setting a default value.
+ *
+ * Return: 0 for false; 1 for true; -1 for non-boolean
+ */
+int parseBool(const char *str, int defaultValue);

src/settings.cpp

@@ -215,39 +215,6 @@ void setStr(QString name, QString value)
     }
 }
 
-/**
- * parse_bool() - Parse boolean value of string.
- * @string: String to interpret. This check is case-insensitive.
- * @default_value: Default value to use if string is not a recognised boolean.
- *                 Use -1 to avoid setting a default value.
- *
- * Return: 0 for false; 1 for true; -1 for non-boolean
- */
-int parseBool(const char *str, int defaultValue)
-{
-    if (!str)
-        goto error_not_a_boolean;
-    else if (!strcasecmp(str, "yes"))
-        return 1;
-    else if (!strcasecmp(str, "true"))
-        return 1;
-    else if (!strcasecmp(str, "on"))
-        return 1;
-    else if (!strcmp(str, "1"))
-        return 1;
-    else if (!strcasecmp(str, "no"))
-        return 0;
-    else if (!strcasecmp(str, "false"))
-        return 0;
-    else if (!strcasecmp(str, "off"))
-        return 0;
-    else if (!strcmp(str, "0"))
-        return 0;
-error_not_a_boolean:
-    qDebug() << str << "is not a boolean value";
-    return defaultValue;
-}
-
 void setBool(QString name, int value)
 {
     std::shared_ptr<Setting> setting = retrieve(name);
@@ -265,9 +232,3 @@ void setBool(QString name, int value)
         setting->setValue(value);
     }
 }
-
-void setBoolfromString(QString name, QString value)
-{
-    int boolValue = parseBool(value.toStdString().c_str(), -1);
-    setBool(name, boolValue);
-}

src/settings.h

@@ -64,4 +64,3 @@ void setInt(QString name, int value);
 void setStr(QString name, QString value);
 int parseBool(const char *str, int defaultValue);
 void setBool(QString name, int value);
-void setBoolfromString(QString name, QString value);

src/xml.cpp

@@ -13,6 +13,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
+#include "parse-bool.h"
 #include "xml.h"
 
 enum xml_mode {
@@ -226,13 +227,9 @@ int xml_get_bool_text(const char *nodename)
     if (!value || !*value) {
         return -1;
     }
-    if (!strcasecmp(value, "yes") || !strcasecmp(value, "true")) {
-        return 1;
-    } else if (!strcasecmp(value, "no") || !strcasecmp(value, "false")) {
-        return 0;
-    } else {
-        return -1;
-    }
+
+    /* Parse consistently with labwc */
+    return parseBool(value, -1);
 }
 
 /* case-insensitive */