Changeset 0c48e14 in mainline for uspace/srv/ns/service.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/service.c (modified) (3 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;
 }