diff options
| author |  Eric Wong <e@80x24.org> | 2019-10-06 23:30:36 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-10-07 10:20:11 +0900 |
| commit | f23a465132a22860684ac66052cf9a954a18e27d (patch) | |
| tree | 0af87116e641be6cc7f7dc75e1a337e917abc610 /merge-recursive.c | |
| parent | hashmap: use *_entry APIs to wrap container_of (diff) | |
| download | tgif-f23a465132a22860684ac66052cf9a954a18e27d.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index a685b4fb69..8274828c4d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -63,7 +63,8 @@ static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, return NULL; hashmap_entry_init(&key.ent, strhash(dir)); key.dir = dir; - return hashmap_get(hashmap, &key.ent, NULL); + return hashmap_get_entry(hashmap, &key, NULL, + struct dir_rename_entry, ent); } static int dir_rename_cmp(const void *unused_cmp_data, @@ -99,7 +100,8 @@ static struct collision_entry *collision_find_entry(struct hashmap *hashmap, hashmap_entry_init(&key.ent, strhash(target_file)); key.target_file = target_file; - return hashmap_get(hashmap, &key.ent, NULL); + return hashmap_get_entry(hashmap, &key, NULL, + struct collision_entry, ent); } static int collision_cmp(void *unused_cmp_data, |