Changeset 241f1985 in mainline for uspace/srv/sysman/repo.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/srv/sysman/repo.c

    rf92b315 r241f1985  
    3030#include <adt/hash_table.h>
    3131#include <adt/list.h>
     32#include <str.h>
    3233#include <assert.h>
    3334#include <errno.h>
    … …  
    5556}
    5657
    57 static size_t units_by_handle_ht_key_hash(void *key)
     58static size_t units_by_handle_ht_key_hash(const void *key)
    5859{
    5960        return *(unit_handle_t *)key;
    … …  
    6768}
    6869
    69 static bool units_by_handle_ht_key_equal(void *key, const ht_link_t *item)
     70static bool units_by_handle_ht_key_equal(const void *key, const ht_link_t *item)
    7071{
    7172        return *(unit_handle_t *)key ==
    … …  
    8889}
    8990
    90 static size_t units_by_name_ht_key_hash(void *key)
     91static size_t units_by_name_ht_key_hash(const void *key)
    9192{
    9293        return hash_string((const char *)key);
    … …  
    100101}
    101102
    102 static bool units_by_name_ht_key_equal(void *key, const ht_link_t *item)
     103static bool units_by_name_ht_key_equal(const void *key, const ht_link_t *item)
    103104{
    104105        return str_cmp((const char *)key,
    … …  
    166167                return EOK;
    167168        } else {
    168                 return EEXISTS;
     169                return EEXIST;
    169170        }
    170171}
Note: See TracChangeset for help on using the changeset viewer.