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 /packfile.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 'packfile.c')
| -rw-r--r-- | packfile.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packfile.c b/packfile.c index f2aa34bb49..675d5f2287 100644 --- a/packfile.c +++ b/packfile.c @@ -1401,11 +1401,16 @@ static int delta_base_cache_key_eq(const struct delta_base_cache_key *a, } static int delta_base_cache_hash_cmp(const void *unused_cmp_data, - const void *va, const void *vb, + const struct hashmap_entry *va, + const struct hashmap_entry *vb, const void *vkey) { - const struct delta_base_cache_entry *a = va, *b = vb; + const struct delta_base_cache_entry *a, *b; const struct delta_base_cache_key *key = vkey; + + a = container_of(va, const struct delta_base_cache_entry, ent); + b = container_of(vb, const struct delta_base_cache_entry, ent); + if (key) return !delta_base_cache_key_eq(&a->key, key); else |