pack-bitmap: drop redundant args from `bitmap_writer_finish()`
In a similar fashion as the previous commit, drop a redundant argument from the `bitmap_writer_finish()` function. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committed
Aug 15, 2024 at 13:31 UTC
11a08e8332762ad0a56c7a92701d85d0d04f94a7
4 files changed
+6
-8
builtin/pack-objects.c
+1
-1
@@ -1370,7 +1370,7 @@ static void write_pack_file(void)
1370
if (bitmap_writer_build(&bitmap_writer) < 0)
1371
die(_("failed to write bitmap index"));
1372
bitmap_writer_finish(&bitmap_writer,
1373
- written_list, nr_written,
1373
+ written_list,
1374
tmpname.buf, write_bitmap_options);
1375
bitmap_writer_free(&bitmap_writer);
1376
write_bitmap_index = 0;
midx-write.c
+1
-2
@@ -851,8 +851,7 @@ static int write_midx_bitmap(const char *midx_name,
851
goto cleanup;
852
853
bitmap_writer_set_checksum(&writer, midx_hash);
854
- bitmap_writer_finish(&writer, index, pdata->nr_objects, bitmap_name,
855
- options);
854
+ bitmap_writer_finish(&writer, index, bitmap_name, options);
855
856
cleanup:
857
free(index);
pack-bitmap-write.c
+4
-4
@@ -998,7 +998,6 @@ void bitmap_writer_set_checksum(struct bitmap_writer *writer,
998
999
void bitmap_writer_finish(struct bitmap_writer *writer,
1000
struct pack_idx_entry **index,
1001
- uint32_t index_nr,
1001
const char *filename,
1002
uint16_t options)
1003
{
@@ -1031,12 +1030,13 @@ void bitmap_writer_finish(struct bitmap_writer *writer,
1030
dump_bitmap(f, writer->tags);
1031
1032
if (options & BITMAP_OPT_LOOKUP_TABLE)
1034
- CALLOC_ARRAY(offsets, index_nr);
1033
+ CALLOC_ARRAY(offsets, writer->to_pack->nr_objects);
1034
1035
for (i = 0; i < bitmap_writer_nr_selected_commits(writer); i++) {
1036
struct bitmapped_commit *stored = &writer->selected[i];
1037
int commit_pos = oid_pos(&stored->commit->object.oid, index,
1039
- index_nr, oid_access);
1038
+ writer->to_pack->nr_objects,
1039
+ oid_access);
1040
1041
if (commit_pos < 0)
1042
BUG(_("trying to write commit not in index"));
@@ -1052,7 +1052,7 @@ void bitmap_writer_finish(struct bitmap_writer *writer,
1052
write_lookup_table(writer, f, offsets);
1053
1054
if (options & BITMAP_OPT_HASH_CACHE)
1055
- write_hash_cache(f, index, index_nr);
1055
+ write_hash_cache(f, index, writer->to_pack->nr_objects);
1056
1057
finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
1058
CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
pack-bitmap.h
-1
@@ -149,7 +149,6 @@ void bitmap_writer_select_commits(struct bitmap_writer *writer,
149
int bitmap_writer_build(struct bitmap_writer *writer);
150
void bitmap_writer_finish(struct bitmap_writer *writer,
151
struct pack_idx_entry **index,
152
- uint32_t index_nr,
152
const char *filename,
153
uint16_t options);
154
void bitmap_writer_free(struct bitmap_writer *writer);