midx: switch to using the_hash_algo
Instead of hard-coding the hash size, use the_hash_algo to look up the hash size at runtime. Remove the #define constant which was used to hold the hash length, since writing the expression with the_hash_algo provide enough documentary value on its own. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Aug 18, 2019 at 20:04 UTC
aaa95dfa051fc517dde0fa31187c744094cd17c5
1 file changed
+5
-6
midx.c
+5
-6
@@ -19,8 +19,7 @@
19
#define MIDX_BYTE_NUM_PACKS 8
20
#define MIDX_HASH_VERSION 1
21
#define MIDX_HEADER_SIZE 12
22
-#define MIDX_HASH_LEN 20
23
-#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + MIDX_HASH_LEN)
22
+#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz)
23
24
#define MIDX_MAX_CHUNKS 5
25
#define MIDX_CHUNK_ALIGNMENT 4
@@ -93,7 +92,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
92
hash_version = m->data[MIDX_BYTE_HASH_VERSION];
93
if (hash_version != MIDX_HASH_VERSION)
94
die(_("hash version %u does not match"), hash_version);
96
- m->hash_len = MIDX_HASH_LEN;
95
+ m->hash_len = the_hash_algo->rawsz;
96
97
m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS];
98
@@ -234,7 +233,7 @@ int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t
233
int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result)
234
{
235
return bsearch_hash(oid->hash, m->chunk_oid_fanout, m->chunk_oid_lookup,
237
- MIDX_HASH_LEN, result);
236
+ the_hash_algo->rawsz, result);
237
}
238
239
struct object_id *nth_midxed_object_oid(struct object_id *oid,
@@ -928,7 +927,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
927
928
cur_chunk++;
929
chunk_ids[cur_chunk] = MIDX_CHUNKID_OBJECTOFFSETS;
931
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_HASH_LEN;
930
+ chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * the_hash_algo->rawsz;
931
932
cur_chunk++;
933
chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_CHUNK_OFFSET_WIDTH;
@@ -976,7 +975,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
975
break;
976
977
case MIDX_CHUNKID_OIDLOOKUP:
979
- written += write_midx_oid_lookup(f, MIDX_HASH_LEN, entries, nr_entries);
978
+ written += write_midx_oid_lookup(f, the_hash_algo->rawsz, entries, nr_entries);
979
break;
980
981
case MIDX_CHUNKID_OBJECTOFFSETS: