diff options
| author | Eric Wong <e@80x24.org> | 2019-10-06 23:30:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 10:20:11 +0900 |
| commit | 939af16eac1608766273d3971598dbcc4fe09928 (patch) | |
| tree | 15abb229ccf6464acd1241fac3db0c45ee7b6bbd /ref-filter.c | |
| parent | f23a465132a22860684ac66052cf9a954a18e27d (diff) | |
| download | git-939af16eac1608766273d3971598dbcc4fe09928.tar.gz | |
hashmap_cmp_fn takes hashmap_entry params
Another step in eliminating the requirement of hashmap_entry
being the first member of 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 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ref-filter.c b/ref-filter.c index 9999426914..4613df8826 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -84,12 +84,15 @@ struct ref_to_worktree_entry { }; static int ref_to_worktree_map_cmpfnc(const void *unused_lookupdata, - const void *existing_hashmap_entry_to_test, - const void *key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *kptr, const void *keydata_aka_refname) { - const struct ref_to_worktree_entry *e = existing_hashmap_entry_to_test; - const struct ref_to_worktree_entry *k = key; + const struct ref_to_worktree_entry *e, *k; + + e = container_of(eptr, const struct ref_to_worktree_entry, ent); + k = container_of(kptr, const struct ref_to_worktree_entry, ent); + return strcmp(e->wt->head_ref, keydata_aka_refname ? keydata_aka_refname : k->wt->head_ref); } |