Changeset 5e801dc in mainline for uspace/srv/ns

Timestamp:

2019-02-25T14:42:38Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a4e78743

Parents:

ee8d4d6

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-25 14:42:38)

git-committer:

GitHub <noreply@…> (2019-02-25 14:42:38)

Message:

Indicate and enforce constness of hash table key in certain functions (#158)

The assumption here is that modifying key in the hash/equal functions in something completely unexpected, and not something you would ever want to do intentionally, so it makes sense to disallow it entirely to get that extra level of checking.

Location:

uspace/srv/ns

Files:

• service.c (modified) (3 diffs)
• task.c (modified) (4 diffs)

uspace/srv/ns/service.c

@@ -65 +65 @@
 } hashed_iface_t;
 
-static size_t service_key_hash(void *key)
-{
-        return *(service_t *) key;
+static size_t service_key_hash(const void *key)
+{
+        const service_t *srv = key;
+        return *srv;
 }
 
@@ -78 +79 @@
 }
 
-static bool service_key_equal(void *key, const ht_link_t *item)
-{
+static bool service_key_equal(const void *key, const ht_link_t *item)
+{
+        const service_t *srv = key;
         hashed_service_t *service =
             hash_table_get_inst(item, hashed_service_t, link);
 
-        return service->service == *(service_t *) key;
-}
-
-static size_t iface_key_hash(void *key)
-{
-        return *(iface_t *) key;
+        return service->service == *srv;
+}
+
+static size_t iface_key_hash(const void *key)
+{
+        const iface_t *iface = key;
+        return *iface;
 }
 
@@ -99 +102 @@
 }
 
-static bool iface_key_equal(void *key, const ht_link_t *item)
-{
+static bool iface_key_equal(const void *key, const ht_link_t *item)
+{
+        const iface_t *kiface = key;
         hashed_iface_t *iface =
             hash_table_get_inst(item, hashed_iface_t, link);
 
-        return iface->iface == *(iface_t *) key;
+        return iface->iface == *kiface;
 }
 

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);
 }