midx: add num_large_offsets to write_midx_context
In an effort to align write_midx_internal() with the chunk-format API, continue to group necessary data into "struct write_midx_context". This change collects the "uint32_t num_large_offsets" into the context. With this new data, write_midx_large_offsets() now matches the chunk_write_fn type. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Feb 18, 2021 at 14:07 UTC
980f525c3cee7e272136eeb6e988a66f5f8a0bd8
1 file changed
+10
-7
midx.c
+10
-7
@@ -464,6 +464,7 @@ struct write_midx_context {
464
465
uint32_t *pack_perm;
466
unsigned large_offsets_needed:1;
467
+ uint32_t num_large_offsets;
468
};
469
470
static void add_pack_to_midx(const char *full_path, size_t full_path_len,
@@ -772,11 +773,14 @@ static size_t write_midx_object_offsets(struct hashfile *f,
773
return written;
774
}
775
775
-static size_t write_midx_large_offsets(struct hashfile *f, uint32_t nr_large_offset,
776
- struct pack_midx_entry *objects, uint32_t nr_objects)
776
+static size_t write_midx_large_offsets(struct hashfile *f,
777
+ void *data)
778
{
778
- struct pack_midx_entry *list = objects, *end = objects + nr_objects;
779
+ struct write_midx_context *ctx = data;
780
+ struct pack_midx_entry *list = ctx->entries;
781
+ struct pack_midx_entry *end = ctx->entries + ctx->entries_nr;
782
size_t written = 0;
783
+ uint32_t nr_large_offset = ctx->num_large_offsets;
784
785
while (nr_large_offset) {
786
struct pack_midx_entry *obj;
@@ -811,7 +815,6 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
815
uint64_t written = 0;
816
uint32_t chunk_ids[MIDX_MAX_CHUNKS + 1];
817
uint64_t chunk_offsets[MIDX_MAX_CHUNKS + 1];
814
- uint32_t num_large_offsets = 0;
818
struct progress *progress = NULL;
819
int pack_name_concat_len = 0;
820
int dropped_packs = 0;
@@ -861,7 +864,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
864
ctx.large_offsets_needed = 0;
865
for (i = 0; i < ctx.entries_nr; i++) {
866
if (ctx.entries[i].offset > 0x7fffffff)
864
- num_large_offsets++;
867
+ ctx.num_large_offsets++;
868
if (ctx.entries[i].offset > 0xffffffff)
869
ctx.large_offsets_needed = 1;
870
}
@@ -961,7 +964,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
964
965
cur_chunk++;
966
chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] +
964
- num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH;
967
+ ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH;
968
}
969
970
chunk_ids[cur_chunk] = 0;
@@ -1010,7 +1013,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
1013
break;
1014
1015
case MIDX_CHUNKID_LARGEOFFSETS:
1013
- written += write_midx_large_offsets(f, num_large_offsets, ctx.entries, ctx.entries_nr);
1016
+ written += write_midx_large_offsets(f, &ctx);
1017
break;
1018
1019
default: