Changeset 0c01270 in mainline

Timestamp:

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

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

0f75a63

Parents:

a81a950d

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-08 11:02:56)

git-committer:

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

Message:

libconf: Fix iterator behavior, fix config error notification

Location:

uspace/lib/conf

Files:

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

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

@@ -66 +66 @@
 typedef enum {
         CONFIGURATION_EMISSING_ITEM = -1,
-        CONFIGURATION_EINVAL_BOOL = -2
+        CONFIGURATION_EINVAL_BOOL = -2,
+        CONFIGURATION_ELIMIT = -3
 } config_error_t;
 

uspace/lib/conf/src/configuration.c

@@ -43 +43 @@
                 const char *string = ini_item_iterator_value(it);
                 const size_t lineno = ini_item_iterator_lineno(it);
-                has_error = has_error ||
-                    config_item->parse(string, field_dst, parse, lineno);
+                bool success = config_item->parse(string, field_dst, parse, lineno);
+                has_error = has_error || !success;
         }
 
@@ -104 +104 @@
         }
 
-        return has_error ? EOK : EINVAL;
+        return has_error ? EINVAL : EOK;
 }
 

uspace/lib/conf/src/ini.c

@@ -489 +489 @@
 bool ini_item_iterator_valid(ini_item_iterator_t *iterator)
 {
-        bool empty = (iterator->cur_item != NULL);
-        bool looped = (iterator->cur_item == iterator->first_item);
-        return empty || (looped && iterator->incremented);
+        bool empty = (iterator->cur_item == NULL);
+        bool maybe_looped = (iterator->cur_item == iterator->first_item);
+        return !(empty || (maybe_looped && iterator->incremented));
 }
 

uspace/lib/conf/test/ini.c

@@ -109 +109 @@
             (str_cmp(first, "value") == 0 && str_cmp(second, "value2") == 0) ||
             (str_cmp(first, "value2") == 0 && str_cmp(second, "value") == 0));
+
+        ini_item_iterator_inc(&it);
+        PCUT_ASSERT_FALSE(ini_item_iterator_valid(&it));
 }