Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 576d160 in mainline


Ignore:
Timestamp:
2020-03-14T15:02:53Z (3 weeks ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
b2171c0
Parents:
1217660
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2020-03-14 15:02:53)
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

Conflicts:

boot/Makefile
uspace/app/sysctl/Makefile
uspace/app/sysctl/main.c
uspace/app/tester/proc/dummy_task.c
uspace/lib/c/generic/async/client.c
uspace/lib/c/generic/async/server.c
uspace/lib/c/generic/ns.c
uspace/lib/c/generic/private/async.h
uspace/lib/c/generic/private/taskman.h
uspace/lib/c/generic/task.c
uspace/lib/c/generic/task_event.c
uspace/lib/c/generic/taskman.c
uspace/lib/c/generic/taskman_noasync.c
uspace/lib/c/include/async.h
uspace/lib/c/include/task.h
uspace/lib/sysman/include/sysman/ctl.h
uspace/lib/sysman/src/ctl.c
uspace/lib/sysman/src/sysman.c
uspace/srv/devman/Makefile
uspace/srv/devman/driver.c
uspace/srv/devman/drv_conn.c
uspace/srv/hid/compositor/compositor.c
uspace/srv/loader/main.c
uspace/srv/locsrv/Makefile
uspace/srv/locsrv/locsrv.c
uspace/srv/ns/clonable.h
uspace/srv/sysman/Makefile
uspace/srv/sysman/connection_broker.c
uspace/srv/sysman/connection_broker.h
uspace/srv/sysman/connection_ctl.c
uspace/srv/sysman/connection_ctl.h
uspace/srv/sysman/edge.c
uspace/srv/sysman/job.c
uspace/srv/sysman/job.h
uspace/srv/sysman/job_closure.c
uspace/srv/sysman/log.h
uspace/srv/sysman/main.c
uspace/srv/sysman/repo.c
uspace/srv/sysman/sm_task.c
uspace/srv/sysman/sm_task.h
uspace/srv/sysman/sysman.c
uspace/srv/sysman/sysman.h
uspace/srv/sysman/test/job_closure.c
uspace/srv/sysman/units/unit_cfg.c
uspace/srv/sysman/units/unit_mnt.c
uspace/srv/sysman/units/unit_svc.c
uspace/srv/taskman/event.c
uspace/srv/taskman/event.h
uspace/srv/taskman/main.c
uspace/srv/taskman/task.c
uspace/srv/vfs/Makefile
uspace/srv/vfs/vfs.c
uspace/srv/vfs/vfs.h
uspace/srv/vfs/vfs_ops.c
uspace/srv/vfs/vfs_register.c

Location:
uspace/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/include/adt/dyn_array.h

    r1217660 r576d160  
    4141typedef struct {
    4242        /** Data buffer of array */
    43         uint8_t *_data;
     43        void *_data;
    4444        /** Size on bytes of a single item */
    4545        size_t _item_size;
  • uspace/lib/conf/src/configuration.c

    r1217660 r576d160  
    138138{
    139139        bool value;
    140         if (stricmp(string, "true") == 0 ||
    141             stricmp(string, "yes") == 0 ||
    142             stricmp(string, "1") == 0) {
     140        if (str_casecmp(string, "true") == 0 ||
     141            str_casecmp(string, "yes") == 0 ||
     142            str_casecmp(string, "1") == 0) {
    143143                value = true;
    144         } else if (stricmp(string, "false") == 0 ||
    145             stricmp(string, "no") == 0 ||
    146             stricmp(string, "0") == 0) {
     144        } else if (str_casecmp(string, "false") == 0 ||
     145            str_casecmp(string, "no") == 0 ||
     146            str_casecmp(string, "0") == 0) {
    147147                value = false;
    148148        } else {
  • uspace/lib/conf/src/ini.c

    r1217660 r576d160  
    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.