Changeset 0c48e14 in mainline for uspace/srv/ns/task.c

Timestamp:

2019-02-24T15:45:40Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

91bef446

Parents:

52b44c6

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 15:07:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-24 15:45:40)

Message:

Indicate and enforce constness of hash table key in certain functions

File:

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

uspace/srv/ns/task.c

@@ -54 +54 @@
 } hashed_task_t;
 
-static size_t task_key_hash(void *key)
-{
-        return *(task_id_t *)key;
-}
-
-static size_t task_hash(const ht_link_t  *item)
+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)
 {
         hashed_task_t *ht = hash_table_get_inst(item, hashed_task_t, link);
@@ -65 +66 @@
 }
 
-static bool task_key_equal(void *key, const ht_link_t *item)
-{
+static bool task_key_equal(const void *key, const ht_link_t *item)
+{
+        const task_id_t *tid = key;
         hashed_task_t *ht = hash_table_get_inst(item, hashed_task_t, link);
-        return ht->id == *(task_id_t *)key;
+        return ht->id == *tid;
 }
 
@@ -97 +99 @@
 /* label-to-id hash table operations */
 
-static size_t p2i_key_hash(void *key)
-{
-        sysarg_t label = *(sysarg_t *)key;
-        return label;
+static size_t p2i_key_hash(const void *key)
+{
+        const sysarg_t *label = key;
+        return *label;
 }
 
@@ -109 +111 @@
 }
 
-static bool p2i_key_equal(void *key, const ht_link_t *item)
-{
-        sysarg_t label = *(sysarg_t *)key;
+static bool p2i_key_equal(const void *key, const ht_link_t *item)
+{
+        const sysarg_t *label = key;
         p2i_entry_t *entry = hash_table_get_inst(item, p2i_entry_t, link);
 
-        return (label == entry->label);
+        return (*label == entry->label);
 }