summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-10-06 23:30:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 01:20:10 (GMT)
commitb6c5241606e67b57470e86ccf547d4ab90008a1d (patch)
tree1c038790abd92afde1f8a256c2f0ac37ec19f69c /merge-recursive.c
parentb94e5c1df674eb4ec8fdeaaae1ad8df552cb5d70 (diff)
downloadgit-b6c5241606e67b57470e86ccf547d4ab90008a1d.zip
git-b6c5241606e67b57470e86ccf547d4ab90008a1d.tar.gz
git-b6c5241606e67b57470e86ccf547d4ab90008a1d.tar.bz2
hashmap_get takes "const struct hashmap_entry *"
This is less error-prone than "const 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 db9b247..2d31a3e 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -63,7 +63,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(hashmap, &key, NULL);
+ return hashmap_get(hashmap, &key.ent, NULL);
}
static int dir_rename_cmp(const void *unused_cmp_data,
@@ -99,7 +99,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(hashmap, &key, NULL);
+ return hashmap_get(hashmap, &key.ent, NULL);
}
static int collision_cmp(void *unused_cmp_data,