diff options
| author | Eric Wong <e@80x24.org> | 2019-10-07 02:30:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 04:20:11 +0300 |
| commit | 939af16eac1608766273d3971598dbcc4fe09928 (patch) | |
| tree | 15abb229ccf6464acd1241fac3db0c45ee7b6bbd /patch-ids.c | |
| parent | f23a465132a22860684ac66052cf9a954a18e27d (diff) | |
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 'patch-ids.c')
| -rw-r--r-- | patch-ids.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/patch-ids.c b/patch-ids.c index 176c47d967..75f8c9f1a1 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -36,14 +36,16 @@ int commit_patch_id(struct commit *commit, struct diff_options *options, * any significance; only that it is non-zero matters. */ static int patch_id_neq(const void *cmpfn_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { /* NEEDSWORK: const correctness? */ struct diff_options *opt = (void *)cmpfn_data; - struct patch_id *a = (void *)entry; - struct patch_id *b = (void *)entry_or_key; + struct patch_id *a, *b; + + a = container_of(eptr, struct patch_id, ent); + b = container_of(entry_or_key, struct patch_id, ent); if (is_null_oid(&a->patch_id) && commit_patch_id(a->commit, opt, &a->patch_id, 0, 0)) |