diff options
| author | Eric Wong <e@80x24.org> | 2019-10-07 02:30:36 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 04:20:11 +0300 |
| commit | f23a465132a22860684ac66052cf9a954a18e27d (patch) | |
| tree | 0af87116e641be6cc7f7dc75e1a337e917abc610 /builtin/difftool.c | |
| parent | f0e63c41139f8982add435536d39aff6f3d4ca98 (diff) | |
hashmap_get{,_from_hash} return "struct hashmap_entry *"
Update callers to use hashmap_get_entry, hashmap_get_entry_from_hash
or container_of as appropriate.
This is another step towards eliminating the requirement of
hashmap_entry being the first field in a struct.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index f41298d199a..fa9c862e3aa 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->entry, NULL); + existing = hashmap_get_entry(map, e, NULL, struct pair_entry, entry); if (existing) { free(e); e = existing; |