From: brian m. carlson Date: Wed, 2 May 2018 00:25:46 +0000 (+0000) Subject: index-pack: abstract away hash function constant X-Git-Tag: v2.18.0-rc0~17^2~24 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5d9e19824573782a9d4461b49bcd78b5faa79963?hp=6390fe20eba4afb1d70e05714c62be7908ad592a index-pack: abstract away hash function constant The code for reading certain pack v2 offsets had a hard-coded 5 representing the number of uint32_t words that we needed to skip over. Specify this value in terms of a value from the_hash_algo. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- diff --git a/builtin/index-pack.c b/builtin/index-pack.c index d81473e722..c1f94a7da6 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1543,12 +1543,13 @@ static void read_v2_anomalous_offsets(struct packed_git *p, { const uint32_t *idx1, *idx2; uint32_t i; + const uint32_t hashwords = the_hash_algo->rawsz / sizeof(uint32_t); /* The address of the 4-byte offset table */ idx1 = (((const uint32_t *)p->index_data) + 2 /* 8-byte header */ + 256 /* fan out */ - + 5 * p->num_objects /* 20-byte SHA-1 table */ + + hashwords * p->num_objects /* object ID table */ + p->num_objects /* CRC32 table */ );