Changeset 5e801dc in mainline for uspace/srv/fs/fat/fat_idx.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/srv/fs/fat/fat_idx.c (modified) (4 diffs)

uspace/srv/fs/fat/fat_idx.c

@@ -117 +117 @@
 } pos_key_t;
 
-static inline size_t pos_key_hash(void *key)
-{
-        pos_key_t *pos = (pos_key_t *)key;
+static inline size_t pos_key_hash(const void *key)
+{
+        const pos_key_t *pos = key;
 
         size_t hash = 0;
@@ -139 +139 @@
 }
 
-static bool pos_key_equal(void *key, const ht_link_t *item)
-{
-        pos_key_t *pos = (pos_key_t *)key;
+static bool pos_key_equal(const void *key, const ht_link_t *item)
+{
+        const pos_key_t *pos = key;
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link);
 
@@ -168 +168 @@
 } idx_key_t;
 
-static size_t idx_key_hash(void *key_arg)
-{
-        idx_key_t *key = (idx_key_t *)key_arg;
+static size_t idx_key_hash(const void *key_arg)
+{
+        const idx_key_t *key = key_arg;
         return hash_combine(key->service_id, key->index);
 }
@@ -180 +180 @@
 }
 
-static bool idx_key_equal(void *key_arg, const ht_link_t *item)
+static bool idx_key_equal(const void *key_arg, const ht_link_t *item)
 {
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link);
-        idx_key_t *key = (idx_key_t *)key_arg;
+        const idx_key_t *key = key_arg;
 
         return key->index == fidx->index && key->service_id == fidx->service_id;