Changeset 5e801dc in mainline for uspace/srv/devman/devtree.c

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.

File:

• uspace/srv/devman/devtree.c (modified) (3 diffs)

uspace/srv/devman/devtree.c

@@ -42 +42 @@
 /* hash table operations */
 
-static inline size_t handle_key_hash(void *key)
-{
-        devman_handle_t handle = *(devman_handle_t *)key;
-        return handle;
+static inline size_t handle_key_hash(const void *key)
+{
+        const devman_handle_t *handle = key;
+        return *handle;
 }
 
@@ -60 +60 @@
 }
 
-static bool devman_devices_key_equal(void *key, const ht_link_t *item)
-{
-        devman_handle_t handle = *(devman_handle_t *)key;
+static bool devman_devices_key_equal(const void *key, const ht_link_t *item)
+{
+        const devman_handle_t *handle = key;
         dev_node_t *dev = hash_table_get_inst(item, dev_node_t, devman_dev);
-        return dev->handle == handle;
-}
-
-static bool devman_functions_key_equal(void *key, const ht_link_t *item)
-{
-        devman_handle_t handle = *(devman_handle_t *)key;
+        return dev->handle == *handle;
+}
+
+static bool devman_functions_key_equal(const void *key, const ht_link_t *item)
+{
+        const devman_handle_t *handle = key;
         fun_node_t *fun = hash_table_get_inst(item, fun_node_t, devman_fun);
-        return fun->handle == handle;
-}
-
-static inline size_t service_id_key_hash(void *key)
-{
-        service_id_t service_id = *(service_id_t *)key;
-        return service_id;
+        return fun->handle == *handle;
+}
+
+static inline size_t service_id_key_hash(const void *key)
+{
+        const service_id_t *service_id = key;
+        return *service_id;
 }
 
@@ -86 +86 @@
 }
 
-static bool loc_functions_key_equal(void *key, const ht_link_t *item)
-{
-        service_id_t service_id = *(service_id_t *)key;
+static bool loc_functions_key_equal(const void *key, const ht_link_t *item)
+{
+        const service_id_t *service_id = key;
         fun_node_t *fun = hash_table_get_inst(item, fun_node_t, loc_fun);
-        return fun->service_id == service_id;
+        return fun->service_id == *service_id;
 }