Changeset 241f1985 in mainline for uspace/srv/taskman/task.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/taskman/task.c (modified) (3 diffs)

uspace/srv/taskman/task.c

@@ -57 +57 @@
  */
 
-static size_t ht_task_key_hash(void *key)
+static size_t ht_task_key_hash(const void *key)
 {
         return *(task_id_t*)key;
@@ -68 +68 @@
 }
 
-static bool ht_task_key_equal(void *key, const ht_link_t *item)
+static bool ht_task_key_equal(const void *key, const ht_link_t *item)
 {
         task_t *ht = hash_table_get_inst(item, task_t, link);
@@ -199 +199 @@
         task_t *t = task_get_by_id(id);
         if (t != NULL) {
-                rc = EEXISTS;
+                rc = EEXIST;
                 goto finish;
         }