From f23a465132a22860684ac66052cf9a954a18e27d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 6 Oct 2019 23:30:36 +0000 Subject: hashmap_get{,_from_hash} return "struct hashmap_entry *" Update callers to use hashmap_get_entry, hashmap_get_entry_from_hash or container_of as appropriate. This is another step towards eliminating the requirement of hashmap_entry being the first field in a struct. Signed-off-by: Eric Wong Reviewed-by: Derrick Stolee Signed-off-by: Junio C Hamano --- hashmap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'hashmap.c') diff --git a/hashmap.c b/hashmap.c index 22bc7c5b3b..5662bee10a 100644 --- a/hashmap.c +++ b/hashmap.c @@ -186,8 +186,9 @@ void hashmap_free(struct hashmap *map, int free_entries) memset(map, 0, sizeof(*map)); } -void *hashmap_get(const struct hashmap *map, const struct hashmap_entry *key, - const void *keydata) +struct hashmap_entry *hashmap_get(const struct hashmap *map, + const struct hashmap_entry *key, + const void *keydata) { return *find_entry_ptr(map, key, keydata); } @@ -298,7 +299,7 @@ const void *memintern(const void *data, size_t len) /* lookup interned string in pool */ hashmap_entry_init(&key.ent, memhash(data, len)); key.len = len; - e = hashmap_get(&map, &key.ent, data); + e = hashmap_get_entry(&map, &key, data, struct pool_entry, ent); if (!e) { /* not found: create it */ FLEX_ALLOC_MEM(e, data, data, len); -- cgit v1.2.3