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 <e@80x24.org>
Reviewed-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Wong
2019-10-06 23:30:36 +00:00
committed by Junio C Hamano
parent f0e63c4113
commit f23a465132
20 changed files with 72 additions and 41 deletions

2
attr.c
View File

@ -101,7 +101,7 @@ static void *attr_hashmap_get(struct attr_hashmap *map,
hashmap_entry_init(&k.ent, memhash(key, keylen));
k.key = key;
k.keylen = keylen;
e = hashmap_get(&map->map, &k.ent, NULL);
e = hashmap_get_entry(&map->map, &k, NULL, struct attr_hash_entry, ent);
return e ? e->value : NULL;
}