Changeset 241f1985 in mainline for uspace/srv/sysman/sysman.c

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:

• uspace/srv/sysman/sysman.c (modified) (5 diffs)

uspace/srv/sysman/sysman.c

@@ -90 +90 @@
 }
 
-static size_t observed_objects_ht_key_hash(void *key)
+static size_t observed_objects_ht_key_hash(const void *key)
 {
         void *object = *(void **) key;
@@ -96 +96 @@
 }
 
-static bool observed_objects_ht_key_equal(void *key, const ht_link_t *item)
+static bool observed_objects_ht_key_equal(const void *key, const ht_link_t *item)
 {
         void *object = *(void **)key;
@@ -213 +213 @@
  * @return EOK on successfully queued job
  */
-int sysman_run_job(unit_t *unit, unit_state_t target_state, int flags,
+errno_t sysman_run_job(unit_t *unit, unit_state_t target_state, int flags,
     callback_handler_t callback, void *callback_arg)
 {
@@ -279 +279 @@
  * @return ENOMEM
  */
-int sysman_object_observer(void *object, callback_handler_t handler, void *data)
-{
-        int rc;
+errno_t sysman_object_observer(void *object, callback_handler_t handler, void *data)
+{
+        errno_t rc;
         observed_object_t *observed_object = NULL;
         observed_object_t *new_observed_object = NULL;
@@ -314 +314 @@
 }
 
-int sysman_move_observers(void *src_object, void *dst_object)
+errno_t sysman_move_observers(void *src_object, void *dst_object)
 {
         ht_link_t *src_link = hash_table_find(&observed_objects, &src_object);