diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 10:16:07 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 10:16:08 +0300 |
commit | ee56992a8792cd5e67029e71f3c75d7ce662ae6d (patch) | |
tree | c98f7be58ae6d56b274225d24732697d15c318ac /midx.c | |
parent | 20f28d7cbd6d8599968ac41664c7300945234d7c (diff) | |
parent | e43d2dcce1db256e95b90f89e06d62834a1d361c (diff) |
Merge branch 'jk/oideq-hasheq-cleanup'
Code clean-up.
* jk/oideq-hasheq-cleanup:
more oideq/hasheq conversions
Diffstat (limited to 'midx.c')
-rw-r--r-- | midx.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -282,8 +282,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; } @@ -580,8 +580,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); |