Changeset 5e801dc in mainline for uspace/lib/nic/src

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/lib/nic/src

Files:

• nic_addr_db.c (modified) (2 diffs)
• nic_wol_virtues.c (modified) (2 diffs)

uspace/lib/nic/src/nic_addr_db.c

@@ -62 +62 @@
 } addr_key_t;
 
-static bool nic_addr_key_equal(void *key_arg, const ht_link_t *item)
-{
-        addr_key_t *key = (addr_key_t *)key_arg;
+static bool nic_addr_key_equal(const void *key_arg, const ht_link_t *item)
+{
+        const addr_key_t *key = key_arg;
         nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
 
@@ -81 +81 @@
 }
 
-static size_t nic_addr_key_hash(void *k)
-{
-        addr_key_t *key = (addr_key_t *)k;
+static size_t nic_addr_key_hash(const void *k)
+{
+        const addr_key_t *key = k;
         return addr_hash(key->len, key->addr);
 }

uspace/lib/nic/src/nic_wol_virtues.c

@@ -45 +45 @@
  */
 
-static size_t nic_wv_key_hash(void *key)
-{
-        return *(nic_wv_id_t *) key;
+static size_t nic_wv_key_hash(const void *key)
+{
+        const nic_wv_id_t *k = key;
+        return *k;
 }
 
@@ -56 +57 @@
 }
 
-static bool nic_wv_key_equal(void *key, const ht_link_t *item)
-{
-        nic_wol_virtue_t *virtue = (nic_wol_virtue_t *) item;
-        return (virtue->id == *(nic_wv_id_t *) key);
+static bool nic_wv_key_equal(const void *key, const ht_link_t *item)
+{
+        const nic_wv_id_t *k = key;
+        const nic_wol_virtue_t *virtue = (const nic_wol_virtue_t *) item;
+        return (virtue->id == *k);
 }