diff options
| author | Jeff King <peff@peff.net> | 2018-10-02 23:19:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-04 12:42:48 +0200 |
| commit | e43d2dcce1db256e95b90f89e06d62834a1d361c (patch) | |
| tree | 72b717680d6b340c71a970c29e7996d0e5b1ec35 /midx.c | |
| parent | Second batch post 2.19 (diff) | |
| download | git-e43d2dcce1db256e95b90f89e06d62834a1d361c.tar.xz git-e43d2dcce1db256e95b90f89e06d62834a1d361c.zip | |
more oideq/hasheq conversions
We added faster equality-comparison functions for hashes in
14438c4497 (introduce hasheq() and oideq(), 2018-08-28). A
few topics were in-flight at the time, and can now be
converted. This covers all spots found by "make coccicheck"
in master (the coccicheck results were tweaked by hand for
style).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | midx.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -285,8 +285,8 @@ static int nth_midxed_pack_entry(struct multi_pack_index *m, struct pack_entry * struct object_id oid; nth_midxed_object_oid(&oid, m, pos); for (i = 0; i < p->num_bad_objects; i++) - if (!hashcmp(oid.hash, - p->bad_object_sha1 + the_hash_algo->rawsz * i)) + if (hasheq(oid.hash, + p->bad_object_sha1 + the_hash_algo->rawsz * i)) return 0; } @@ -583,8 +583,8 @@ static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m, * Take only the first duplicate. */ for (cur_object = 0; cur_object < nr_fanout; cur_object++) { - if (cur_object && !oidcmp(&entries_by_fanout[cur_object - 1].oid, - &entries_by_fanout[cur_object].oid)) + if (cur_object && oideq(&entries_by_fanout[cur_object - 1].oid, + &entries_by_fanout[cur_object].oid)) continue; ALLOC_GROW(deduplicated_entries, *nr_objects + 1, alloc_objects); |