pack-bitmap: drop redundant args from `bitmap_writer_build()`
In a similar fashion as the previous commit, drop a redundant argument from the `bitmap_writer_build()` 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
f00dda48490c1d5d515cc97b5b3197c0ed1c7ed9
4 files changed
+6
-10
builtin/pack-objects.c
+1
-1
@@ -1367,7 +1367,7 @@ static void write_pack_file(void)
1367
bitmap_writer_select_commits(&bitmap_writer,
1368
indexed_commits,
1369
indexed_commits_nr);
1370
- if (bitmap_writer_build(&bitmap_writer, &to_pack) < 0)
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,
midx-write.c
+1
-1
@@ -846,7 +846,7 @@ static int write_midx_bitmap(const char *midx_name,
846
index[pack_order[i]] = &pdata->objects[i].idx;
847
848
bitmap_writer_select_commits(&writer, commits, commits_nr);
849
- ret = bitmap_writer_build(&writer, pdata);
849
+ ret = bitmap_writer_build(&writer);
850
if (ret < 0)
851
goto cleanup;
852
pack-bitmap-write.c
+3
-6
@@ -569,8 +569,7 @@ static void store_selected(struct bitmap_writer *writer,
569
kh_value(writer->bitmaps, hash_pos) = stored;
570
}
571
572
-int bitmap_writer_build(struct bitmap_writer *writer,
573
- struct packing_data *to_pack)
572
+int bitmap_writer_build(struct bitmap_writer *writer)
573
{
574
struct bitmap_builder bb;
575
size_t i;
@@ -581,17 +580,15 @@ int bitmap_writer_build(struct bitmap_writer *writer,
580
uint32_t *mapping;
581
int closed = 1; /* until proven otherwise */
582
584
- writer->to_pack = to_pack;
585
-
583
if (writer->show_progress)
584
writer->progress = start_progress("Building bitmaps",
585
writer->selected_nr);
586
trace2_region_enter("pack-bitmap-write", "building_bitmaps_total",
587
the_repository);
588
592
- old_bitmap = prepare_bitmap_git(to_pack->repo);
589
+ old_bitmap = prepare_bitmap_git(writer->to_pack->repo);
590
if (old_bitmap)
594
- mapping = create_bitmap_mapping(old_bitmap, to_pack);
591
+ mapping = create_bitmap_mapping(old_bitmap, writer->to_pack);
592
else
593
mapping = NULL;
594
pack-bitmap.h
+1
-2
@@ -146,8 +146,7 @@ struct ewah_bitmap *pseudo_merge_bitmap_for_commit(struct bitmap_index *bitmap_g
146
void bitmap_writer_select_commits(struct bitmap_writer *writer,
147
struct commit **indexed_commits,
148
unsigned int indexed_commits_nr);
149
-int bitmap_writer_build(struct bitmap_writer *writer,
150
- struct packing_data *to_pack);
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,