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 /builtin/describe.c | |
| parent | hashmap_get{,_from_hash} return "struct hashmap_entry *" (diff) | |
| download | tgif-939af16eac1608766273d3971598dbcc4fe09928.tar.xz | |
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 'builtin/describe.c')
| -rw-r--r-- | builtin/describe.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index c6d2386b64..e9267b5c9c 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -64,12 +64,14 @@ static const char *prio_names[] = { }; static int commit_name_neq(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *peeled) { - const struct commit_name *cn1 = entry; - const struct commit_name *cn2 = entry_or_key; + const struct commit_name *cn1, *cn2; + + cn1 = container_of(eptr, const struct commit_name, entry); + cn2 = container_of(entry_or_key, const struct commit_name, entry); return !oideq(&cn1->peeled, peeled ? peeled : &cn2->peeled); } |