Skip to content

Commit aaa95df

Browse files
bk2204gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent be8e172 commit aaa95df

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

midx.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
#define MIDX_BYTE_NUM_PACKS 8
2020
#define MIDX_HASH_VERSION 1
2121
#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)
2423

2524
#define MIDX_MAX_CHUNKS 5
2625
#define MIDX_CHUNK_ALIGNMENT 4
@@ -93,7 +92,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
9392
hash_version = m->data[MIDX_BYTE_HASH_VERSION];
9493
if (hash_version != MIDX_HASH_VERSION)
9594
die(_("hash version %u does not match"), hash_version);
96-
m->hash_len = MIDX_HASH_LEN;
95+
m->hash_len = the_hash_algo->rawsz;
9796

9897
m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS];
9998

@@ -234,7 +233,7 @@ int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t
234233
int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result)
235234
{
236235
return bsearch_hash(oid->hash, m->chunk_oid_fanout, m->chunk_oid_lookup,
237-
MIDX_HASH_LEN, result);
236+
the_hash_algo->rawsz, result);
238237
}
239238

240239
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 *
928927

929928
cur_chunk++;
930929
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;
932931

933932
cur_chunk++;
934933
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 *
976975
break;
977976

978977
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);
980979
break;
981980

982981
case MIDX_CHUNKID_OBJECTOFFSETS:

0 commit comments

Comments
 (0)