diff options
author | Eric Wong <e@80x24.org> | 2019-10-06 23:30:36 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 10:20:11 +0900 |
commit | f23a465132a22860684ac66052cf9a954a18e27d (patch) | |
tree | 0af87116e641be6cc7f7dc75e1a337e917abc610 /ref-filter.c | |
parent | f0e63c41139f8982add435536d39aff6f3d4ca98 (diff) | |
download | git-f23a465132a22860684ac66052cf9a954a18e27d.tar.gz |
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 'ref-filter.c')
-rw-r--r-- | ref-filter.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ref-filter.c b/ref-filter.c index d939ebc6bb..9999426914 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1585,18 +1585,20 @@ static void lazy_init_worktree_map(void) static char *get_worktree_path(const struct used_atom *atom, const struct ref_array_item *ref) { - struct hashmap_entry entry; + struct hashmap_entry entry, *e; struct ref_to_worktree_entry *lookup_result; lazy_init_worktree_map(); hashmap_entry_init(&entry, strhash(ref->refname)); - lookup_result = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname); + e = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname); - if (lookup_result) - return xstrdup(lookup_result->wt->path); - else + if (!e) return xstrdup(""); + + lookup_result = container_of(e, struct ref_to_worktree_entry, ent); + + return xstrdup(lookup_result->wt->path); } /* |