Changeset 5e801dc in mainline for uspace/app/trace/proto.c

Timestamp:

2019-02-25T14:42:38Z (5 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/app/trace/proto.c (modified) (4 diffs)

uspace/app/trace/proto.c

@@ -57 +57 @@
 /* Hash table operations. */
 
-static size_t srv_proto_key_hash(void *key)
-{
-        return *(int *)key;
+static size_t srv_proto_key_hash(const void *key)
+{
+        const int *n = key;
+        return *n;
 }
 
@@ -68 +69 @@
 }
 
-static bool srv_proto_key_equal(void *key, const ht_link_t *item)
-{
+static bool srv_proto_key_equal(const void *key, const ht_link_t *item)
+{
+        const int *n = key;
         srv_proto_t *sp = hash_table_get_inst(item, srv_proto_t, link);
-        return sp->srv == *(int *)key;
+        return sp->srv == *n;
 }
 
@@ -82 +84 @@
 };
 
-static size_t method_oper_key_hash(void *key)
-{
-        return *(int *)key;
+static size_t method_oper_key_hash(const void *key)
+{
+        const int *n = key;
+        return *n;
 }
 
@@ -93 +96 @@
 }
 
-static bool method_oper_key_equal(void *key, const ht_link_t *item)
-{
+static bool method_oper_key_equal(const void *key, const ht_link_t *item)
+{
+        const int *n = key;
         method_oper_t *mo = hash_table_get_inst(item, method_oper_t, link);
-        return mo->method == *(int *)key;
+        return mo->method == *n;
 }