[PATCH 01/10] attr.c: drop hashmap_cmp_fn cast
- From
Stefan Beller <sbeller@google.com>
- Date
- Jul 1, 2017, 00:28 UTC
- Message-ID
- <20170701002838.22785-2-sbeller@google.com>
- In-Reply-To
- <20170701002838.22785-1-sbeller@google.com>
MAke the code more readable and less error prone by avoiding the cast of the compare function pointer in hashmap_init, but instead have the correctly named void pointers to casted to the specific data structure.
Signed-off-by: Stefan Beller <sbeller@google.com> --- attr.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/attr.c b/attr.c index 56961f0236..2f49151736 100644 --- a/attr.c +++ b/attr.c @@ -76,18 +76,20 @@ struct attr_hash_entry { }; /* attr_hashmap comparison function */ -static int attr_hash_entry_cmp(void *unused_cmp_data, - const struct attr_hash_entry *a, - const struct attr_hash_entry *b, - void *unused_keydata) +static int attr_hash_entry_cmp(const void *unused_cmp_data, + const void *entry, + const void *entry_or_key, + const void *unused_keydata) { + const struct attr_hash_entry *a = entry; + const struct attr_hash_entry *b = entry_or_key; return (a->keylen != b->keylen) || strncmp(a->key, b->key, a->keylen); } /* Initialize an 'attr_hashmap' object */ static void attr_hashmap_init(struct attr_hashmap *map) { - hashmap_init(&map->map, (hashmap_cmp_fn) attr_hash_entry_cmp, NULL, 0); + hashmap_init(&map->map, attr_hash_entry_cmp, NULL, 0); } /*
-- 2.13.0.31.g9b732c453e