summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-10-06 23:30:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 01:20:10 (GMT)
commit26b455f21ed7e0c7b0e4e4e69b5ae48545597020 (patch)
tree0c0a69083353100d2f637322791f4499e8cb27bf /merge-recursive.c
parent28ee7941280828f9e528bd8c5d0f6515a57e0c44 (diff)
downloadgit-26b455f21ed7e0c7b0e4e4e69b5ae48545597020.zip
git-26b455f21ed7e0c7b0e4e4e69b5ae48545597020.tar.gz
git-26b455f21ed7e0c7b0e4e4e69b5ae48545597020.tar.bz2
hashmap_put takes "struct hashmap_entry *"
This is less error-prone than "void *" as the compiler now detects invalid types being passed. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index f60451d..a685b4f 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2229,7 +2229,7 @@ static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
if (!entry) {
entry = xmalloc(sizeof(*entry));
dir_rename_entry_init(entry, old_dir);
- hashmap_put(dir_renames, entry);
+ hashmap_put(dir_renames, &entry->ent);
} else {
free(old_dir);
}
@@ -2360,7 +2360,7 @@ static void compute_collisions(struct hashmap *collisions,
sizeof(struct collision_entry));
hashmap_entry_init(&collision_ent->ent,
strhash(new_path));
- hashmap_put(collisions, collision_ent);
+ hashmap_put(collisions, &collision_ent->ent);
collision_ent->target_file = new_path;
} else {
free(new_path);