path: root/merge-recursive.c
diff options
authorEric Wong <>2019-10-06 23:30:42 (GMT)
committerJunio C Hamano <>2019-10-07 01:20:12 (GMT)
commit404ab78e39fc74c4eb604b6003642ed264f687a6 (patch)
tree54cea276f612f84304b9420257a8a667d02ccbbe /merge-recursive.c
parent23dee69f53cf5024ca79e0b707dcb03c63f33bef (diff)
hashmap: remove type arg from hashmap_{get,put,remove}_entry
Since these macros already take a `keyvar' pointer of a known type, we can rely on OFFSETOF_VAR to get the correct offset without relying on non-portable `__typeof__' and `offsetof'. Argument order is also rearranged, so `keyvar' and `member' are sequential as they are used as: `keyvar->member' Signed-off-by: Eric Wong <> Reviewed-by: Derrick Stolee <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'merge-recursive.c')
1 files changed, 2 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 3abba3a..8787a40 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -65,8 +65,7 @@ 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_entry(hashmap, &key, NULL,
- struct dir_rename_entry, ent);
+ return hashmap_get_entry(hashmap, &key, ent, NULL);
static int dir_rename_cmp(const void *unused_cmp_data,
@@ -104,8 +103,7 @@ 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_entry(hashmap, &key, NULL,
- struct collision_entry, ent);
+ return hashmap_get_entry(hashmap, &key, ent, NULL);
static int collision_cmp(const void *unused_cmp_data,