Changeset a81a950d in mainline

Timestamp:

2020-07-05T21:00:33Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

0c01270

Parents:

a58727c

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-07 11:47:29)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-07-05 21:00:33)

Message:

libconf: Parse booleans

Location:

uspace/lib/conf

Files:

• include/conf/configuration.h (modified) (2 diffs)
• src/configuration.c (modified) (1 diff)

uspace/lib/conf/include/conf/configuration.h

@@ -65 +65 @@
 /** Code of configuration processing error */
 typedef enum {
-        CONFIGURATION_EMISSING_ITEM = -1
+        CONFIGURATION_EMISSING_ITEM = -1,
+        CONFIGURATION_EINVAL_BOOL = -2
 } config_error_t;
 
@@ -74 +75 @@
 
 extern bool config_parse_string(const char *, void *, text_parse_t *, size_t);
+extern bool config_parse_bool(const char *, void *, text_parse_t *, size_t);
 
 #endif

uspace/lib/conf/src/configuration.c

@@ -126 +126 @@
         return true;
 }
+
+/** Parse boolean value
+ *
+ * @param[out]  dst      pointer to bool
+ *
+ * @return  true   on success
+ * @return  false  on parse error
+ */
+bool config_parse_bool(const char *string, void *dst, text_parse_t *parse,
+    size_t lineno)
+{
+        bool value;
+        if (stricmp(string, "true") == 0 ||
+            stricmp(string, "yes") == 0 ||
+            stricmp(string, "1") == 0) {
+                value = true;
+        } else if (stricmp(string, "false") == 0 ||
+            stricmp(string, "no") == 0 ||
+            stricmp(string, "0") == 0) {
+                value = false;
+        } else {
+                text_parse_raise_error(parse, lineno,
+                    CONFIGURATION_EINVAL_BOOL);
+                return false;
+        }
+
+        bool *bool_dst = dst;
+        *bool_dst = value;
+        return true;
+}