Changeset 241f1985 in mainline for uspace/lib/conf/src

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

Location:

uspace/lib/conf/src

Files:

• configuration.c (modified) (1 diff)
• ini.c (modified) (5 diffs)

uspace/lib/conf/src/configuration.c

@@ -138 +138 @@
 {
         bool value;
-        if (stricmp(string, "true") == 0 ||
-            stricmp(string, "yes") == 0 ||
-            stricmp(string, "1") == 0) {
+        if (str_casecmp(string, "true") == 0 ||
+            str_casecmp(string, "yes") == 0 ||
+            str_casecmp(string, "1") == 0) {
                 value = true;
-        } else if (stricmp(string, "false") == 0 ||
-            stricmp(string, "no") == 0 ||
-            stricmp(string, "0") == 0) {
+        } else if (str_casecmp(string, "false") == 0 ||
+            str_casecmp(string, "no") == 0 ||
+            str_casecmp(string, "0") == 0) {
                 value = false;
         } else {

uspace/lib/conf/src/ini.c

@@ -75 +75 @@
 }
 
-static size_t ini_section_ht_key_hash(void *key)
+static size_t ini_section_ht_key_hash(const void *key)
 {
         /* Nameless default section */
@@ -91 +91 @@
 }
 
-static bool ini_section_ht_key_equal(void *key, const ht_link_t *item)
+static bool ini_section_ht_key_equal(const void *key, const ht_link_t *item)
 {
         const char *name = key;
@@ -119 +119 @@
 }
 
-static size_t ini_item_ht_key_hash(void *key)
+static size_t ini_item_ht_key_hash(const void *key)
 {
         return hash_string((const char *)key);
@@ -131 +131 @@
 }
 
-static bool ini_item_ht_key_equal(void *key, const ht_link_t *item)
+static bool ini_item_ht_key_equal(const void *key, const ht_link_t *item)
 {
         return str_cmp((const char *)key,
@@ -501 +501 @@
 {
         iterator->cur_item =
-            hash_table_find_next(iterator->table, iterator->cur_item);
+            hash_table_find_next(iterator->table, iterator->first_item, iterator->cur_item);
         iterator->incremented = true;
 }