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>

diff --git a/midx.c b/midx.c
index cd994e333ecb73ffe8f76ca7a629de0bd721c455..5be081f229adccce82f7dba011604a31f00a5fd9 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -464,6 +464,7 @@ struct write_midx_context {
 
        uint32_t *pack_perm;
        unsigned large_offsets_needed:1;
+       uint32_t num_large_offsets;
 };
 
 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,
        return written;
 }
 
-static size_t write_midx_large_offsets(struct hashfile *f, uint32_t nr_large_offset,
-                                      struct pack_midx_entry *objects, uint32_t nr_objects)
+static size_t write_midx_large_offsets(struct hashfile *f,
+                                      void *data)
 {
-       struct pack_midx_entry *list = objects, *end = objects + nr_objects;
+       struct write_midx_context *ctx = data;
+       struct pack_midx_entry *list = ctx->entries;
+       struct pack_midx_entry *end = ctx->entries + ctx->entries_nr;
        size_t written = 0;
+       uint32_t nr_large_offset = ctx->num_large_offsets;
 
        while (nr_large_offset) {
                struct pack_midx_entry *obj;
@@ -811,7 +815,6 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
        uint64_t written = 0;
        uint32_t chunk_ids[MIDX_MAX_CHUNKS + 1];
        uint64_t chunk_offsets[MIDX_MAX_CHUNKS + 1];
-       uint32_t num_large_offsets = 0;
        struct progress *progress = NULL;
        int pack_name_concat_len = 0;
        int dropped_packs = 0;
@@ -861,7 +864,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
        ctx.large_offsets_needed = 0;
        for (i = 0; i < ctx.entries_nr; i++) {
                if (ctx.entries[i].offset > 0x7fffffff)
-                       num_large_offsets++;
+                       ctx.num_large_offsets++;
                if (ctx.entries[i].offset > 0xffffffff)
                        ctx.large_offsets_needed = 1;
        }
@@ -961,7 +964,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 
                cur_chunk++;
                chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] +
-                                          num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH;
+                                          ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH;
        }
 
        chunk_ids[cur_chunk] = 0;
@@ -1010,7 +1013,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
                                break;
 
                        case MIDX_CHUNKID_LARGEOFFSETS:
-                               written += write_midx_large_offsets(f, num_large_offsets, ctx.entries, ctx.entries_nr);
+                               written += write_midx_large_offsets(f, &ctx);
                                break;
 
                        default: