Changeset 0c48e14 in mainline for uspace/app

Timestamp:

2019-02-24T15:45:40Z (7 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

Location:

uspace/app

Files:

• hbench/env.c (modified) (1 diff)
• trace/ipcp.c (modified) (2 diffs)
• trace/proto.c (modified) (4 diffs)

uspace/app/hbench/env.c

@@ -52 +52 @@
 }
 
-static size_t param_key_hash(void *key)
+static size_t param_key_hash(const void *key)
 {
-        char *key_str = key;
+        const char *key_str = key;
         return str_size(key_str);
 }
 
-static bool param_key_equal(void *key, const ht_link_t *item)
+static bool param_key_equal(const void *key, const ht_link_t *item)
 {
         param_t *param = hash_table_get_inst(item, param_t, link);
-        char *key_str = key;
+        const char *key_str = key;
 
         return str_cmp(param->key, key_str) == 0;

uspace/app/trace/ipcp.c

@@ -72 +72 @@
 proto_t *proto_unknown;         /**< Protocol with no known methods. */
 
-static size_t pending_call_key_hash(void *key)
-{
-        cap_call_handle_t *chandle = (cap_call_handle_t *) key;
+static size_t pending_call_key_hash(const void *key)
+{
+        const cap_call_handle_t *chandle = key;
         return cap_handle_raw(*chandle);
 }
@@ -84 +84 @@
 }
 
-static bool pending_call_key_equal(void *key, const ht_link_t *item)
-{
-        cap_call_handle_t *chandle = (cap_call_handle_t *) key;
+static bool pending_call_key_equal(const void *key, const ht_link_t *item)
+{
+        const cap_call_handle_t *chandle = key;
         pending_call_t *hs = hash_table_get_inst(item, pending_call_t, link);
 

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