Changeset 241f1985 in mainline for uspace/lib/conf/src/ini.c


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/conf/src/ini.c

    rf92b315 r241f1985  
    7575}
    7676
    77 static size_t ini_section_ht_key_hash(void *key)
     77static size_t ini_section_ht_key_hash(const void *key)
    7878{
    7979        /* Nameless default section */
    … …  
    9191}
    9292
    93 static bool ini_section_ht_key_equal(void *key, const ht_link_t *item)
     93static bool ini_section_ht_key_equal(const void *key, const ht_link_t *item)
    9494{
    9595        const char *name = key;
    … …  
    119119}
    120120
    121 static size_t ini_item_ht_key_hash(void *key)
     121static size_t ini_item_ht_key_hash(const void *key)
    122122{
    123123        return hash_string((const char *)key);
    … …  
    131131}
    132132
    133 static bool ini_item_ht_key_equal(void *key, const ht_link_t *item)
     133static bool ini_item_ht_key_equal(const void *key, const ht_link_t *item)
    134134{
    135135        return str_cmp((const char *)key,
    … …  
    501501{
    502502        iterator->cur_item =
    503             hash_table_find_next(iterator->table, iterator->cur_item);
     503            hash_table_find_next(iterator->table, iterator->first_item, iterator->cur_item);
    504504        iterator->incremented = true;
    505505}
Note: See TracChangeset for help on using the changeset viewer.