Changeset 5e801dc in mainline for uspace/srv/vfs/vfs_node.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/vfs/vfs_node.c (modified) (3 diffs)

uspace/srv/vfs/vfs_node.c

@@ -60 +60 @@
 #define KEY_INDEX       2
 
-static size_t nodes_key_hash(void *);
+static size_t nodes_key_hash(const void *);
 static size_t nodes_hash(const ht_link_t *);
-static bool nodes_key_equal(void *, const ht_link_t *);
+static bool nodes_key_equal(const void *, const ht_link_t *);
 static vfs_triplet_t node_triplet(vfs_node_t *node);
 
@@ -280 +280 @@
 }
 
-static size_t nodes_key_hash(void *key)
-{
-        vfs_triplet_t *tri = key;
+static size_t nodes_key_hash(const void *key)
+{
+        const vfs_triplet_t *tri = key;
         size_t hash = hash_combine(tri->fs_handle, tri->index);
         return hash_combine(hash, tri->service_id);
@@ -294 +294 @@
 }
 
-static bool nodes_key_equal(void *key, const ht_link_t *item)
-{
-        vfs_triplet_t *tri = key;
+static bool nodes_key_equal(const void *key, const ht_link_t *item)
+{
+        const vfs_triplet_t *tri = key;
         vfs_node_t *node = hash_table_get_inst(item, vfs_node_t, nh_link);
         return node->fs_handle == tri->fs_handle &&