Changes in uspace/srv/ns/task.c [5e801dc:6769005] in mainline

File:

• uspace/srv/ns/task.c (modified) (6 diffs)

uspace/srv/ns/task.c

@@ -54 +54 @@
 } hashed_task_t;
 
-static size_t task_key_hash(const void *key)
-{
-        const task_id_t *tid = key;
-        return *tid;
-}
-
-static size_t task_hash(const ht_link_t *item)
+static size_t task_key_hash(void *key)
+{
+        return *(task_id_t *)key;
+}
+
+static size_t task_hash(const ht_link_t  *item)
 {
         hashed_task_t *ht = hash_table_get_inst(item, hashed_task_t, link);
@@ -66 +65 @@
 }
 
-static bool task_key_equal(const void *key, const ht_link_t *item)
-{
-        const task_id_t *tid = key;
+static bool task_key_equal(void *key, const ht_link_t *item)
+{
         hashed_task_t *ht = hash_table_get_inst(item, hashed_task_t, link);
-        return ht->id == *tid;
+        return ht->id == *(task_id_t *)key;
 }
 
@@ -99 +97 @@
 /* label-to-id hash table operations */
 
-static size_t p2i_key_hash(const void *key)
-{
-        const sysarg_t *label = key;
-        return *label;
+static size_t p2i_key_hash(void *key)
+{
+        sysarg_t label = *(sysarg_t *)key;
+        return label;
 }
 
@@ -111 +109 @@
 }
 
-static bool p2i_key_equal(const void *key, const ht_link_t *item)
-{
-        const sysarg_t *label = key;
+static bool p2i_key_equal(void *key, const ht_link_t *item)
+{
+        sysarg_t label = *(sysarg_t *)key;
         p2i_entry_t *entry = hash_table_get_inst(item, p2i_entry_t, link);
 
-        return (*label == entry->label);
+        return (label == entry->label);
 }
 
@@ -227 +225 @@
 errno_t ns_task_id_intro(ipc_call_t *call)
 {
-        task_id_t id = MERGE_LOUP32(ipc_get_arg1(call), ipc_get_arg2(call));
+        task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
 
         ht_link_t *link = hash_table_find(&phone_to_id, &call->request_label);
@@ -291 +289 @@
         ht->finished = true;
         ht->have_rval = true;
-        ht->retval = ipc_get_arg1(call);
+        ht->retval = IPC_GET_ARG1(*call);
 
         process_pending_wait();