hashmap: remove type arg from hashmap_{get,put,remove}_entry

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 3abba3a6181bdc9350b7ccc00377bda4a0e1f3bb..8787a40b0c2525b6b9be7bf1c42b345ed4b36d3c 100644 (file)
--- 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,