path: root/merge-recursive.c
diff options
authorEric Wong <>2019-10-06 23:30:36 (GMT)
committerJunio C Hamano <>2019-10-07 01:20:11 (GMT)
commitf23a465132a22860684ac66052cf9a954a18e27d (patch)
tree0af87116e641be6cc7f7dc75e1a337e917abc610 /merge-recursive.c
parentf0e63c41139f8982add435536d39aff6f3d4ca98 (diff)
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 <>
Diffstat (limited to 'merge-recursive.c')
1 files changed, 4 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index a685b4f..8274828 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,