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

    rf92b315 r241f1985  
    9090}
    9191
    92 static size_t observed_objects_ht_key_hash(void *key)
     92static size_t observed_objects_ht_key_hash(const void *key)
    9393{
    9494        void *object = *(void **) key;
     
    9696}
    9797
    98 static bool observed_objects_ht_key_equal(void *key, const ht_link_t *item)
     98static bool observed_objects_ht_key_equal(const void *key, const ht_link_t *item)
    9999{
    100100        void *object = *(void **)key;
     
    213213 * @return EOK on successfully queued job
    214214 */
    215 int sysman_run_job(unit_t *unit, unit_state_t target_state, int flags,
     215errno_t sysman_run_job(unit_t *unit, unit_state_t target_state, int flags,
    216216    callback_handler_t callback, void *callback_arg)
    217217{
     
    279279 * @return ENOMEM
    280280 */
    281 int sysman_object_observer(void *object, callback_handler_t handler, void *data)
    282 {
    283         int rc;
     281errno_t sysman_object_observer(void *object, callback_handler_t handler, void *data)
     282{
     283        errno_t rc;
    284284        observed_object_t *observed_object = NULL;
    285285        observed_object_t *new_observed_object = NULL;
     
    314314}
    315315
    316 int sysman_move_observers(void *src_object, void *dst_object)
     316errno_t sysman_move_observers(void *src_object, void *dst_object)
    317317{
    318318        ht_link_t *src_link = hash_table_find(&observed_objects, &src_object);
Note: See TracChangeset for help on using the changeset viewer.