mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert "hashcmp() != 0" to "!hasheq()"

Browse Source 
This rounds out the previous three patches, covering the
inequality logic for the "hash" variant of the functions.

As with the previous three, the accompanying code changes
are the mechanical result of applying the coccinelle patch;
see those patches for more discussion.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2018-08-28 17:22:52 -04:00
committed by Junio C Hamano
parent 9001dc2a74
commit 67947c34ae
12 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
read-cache.c
View File

@ -1668,7 +1668,7 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size)
the_hash_algo->init_fn(&c);
the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz);
the_hash_algo->final_fn(hash, &c);
if (hashcmp(hash, (unsigned char *)hdr + size - the_hash_algo->rawsz))
if (!hasheq(hash, (unsigned char *)hdr + size - the_hash_algo->rawsz))
return error("bad index file sha1 signature");
return 0;
}
@ -2395,7 +2395,7 @@ static int verify_index_from(const struct index_state *istate, const char *path)
if (n != the_hash_algo->rawsz)
goto out;
if (hashcmp(istate->oid.hash, hash))
if (!hasheq(istate->oid.hash, hash))
goto out;
close(fd);