Changeset bc73be3 in mainline for kernel/generic/src/lib/ra.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• kernel/generic/src/lib/ra.c (modified) (1 diff)

kernel/generic/src/lib/ra.c

@@ -67 +67 @@
 
 /** Return the hash of the key */
-static size_t used_key_hash(void *key)
-{
-        uintptr_t *base = (uintptr_t *) key;
+static size_t used_key_hash(const void *key)
+{
+        const uintptr_t *base = key;
         return hash_mix(*base);
 }
 
 /** Return true if the key is equal to the item's lookup key */
-static bool used_key_equal(void *key, const ht_link_t *item)
-{
-        uintptr_t *base = (uintptr_t *) key;
+static bool used_key_equal(const void *key, const ht_link_t *item)
+{
+        const uintptr_t *base = key;
         ra_segment_t *seg = hash_table_get_inst(item, ra_segment_t, uh_link);
         return seg->base == *base;