diff options
| author |  Eric Wong <e@80x24.org> | 2019-10-06 23:30:30 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-10-07 10:20:10 +0900 |
| commit | b6c5241606e67b57470e86ccf547d4ab90008a1d (patch) | |
| tree | 1c038790abd92afde1f8a256c2f0ac37ec19f69c /builtin/difftool.c | |
| parent | hashmap_add takes "struct hashmap_entry *" (diff) | |
| download | tgif-b6c5241606e67b57470e86ccf547d4ab90008a1d.tar.xz | |
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 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 82c146718d..f41298d199 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -162,7 +162,7 @@ static void add_left_or_right(struct hashmap *map, const char *path, FLEX_ALLOC_STR(e, path, path); hashmap_entry_init(&e->entry, strhash(path)); - existing = hashmap_get(map, e, NULL); + existing = hashmap_get(map, &e->entry, NULL); if (existing) { free(e); e = existing; @@ -462,7 +462,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, /* Avoid duplicate working_tree entries */ FLEX_ALLOC_STR(entry, path, dst_path); hashmap_entry_init(&entry->entry, strhash(dst_path)); - if (hashmap_get(&working_tree_dups, entry, NULL)) { + if (hashmap_get(&working_tree_dups, &entry->entry, + NULL)) { free(entry); continue; } |