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:

committed by
Junio C Hamano

parent
f0e63c4113
commit
f23a465132
@ -162,7 +162,7 @@ static void add_left_or_right(struct hashmap *map, const char *path,
|
||||
|
||||
FLEX_ALLOC_STR(e, path, path);
|
||||
hashmap_entry_init(&e->entry, strhash(path));
|
||||
existing = hashmap_get(map, &e->entry, NULL);
|
||||
existing = hashmap_get_entry(map, e, NULL, struct pair_entry, entry);
|
||||
if (existing) {
|
||||
free(e);
|
||||
e = existing;
|
||||
|
Reference in New Issue
Block a user