Skip to content

Commit f00dda4

Browse files
ttaylorrgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 125ee4a commit f00dda4

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

builtin/pack-objects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ static void write_pack_file(void)
13671367
bitmap_writer_select_commits(&bitmap_writer,
13681368
indexed_commits,
13691369
indexed_commits_nr);
1370-
if (bitmap_writer_build(&bitmap_writer, &to_pack) < 0)
1370+
if (bitmap_writer_build(&bitmap_writer) < 0)
13711371
die(_("failed to write bitmap index"));
13721372
bitmap_writer_finish(&bitmap_writer,
13731373
written_list, nr_written,

midx-write.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ static int write_midx_bitmap(const char *midx_name,
846846
index[pack_order[i]] = &pdata->objects[i].idx;
847847

848848
bitmap_writer_select_commits(&writer, commits, commits_nr);
849-
ret = bitmap_writer_build(&writer, pdata);
849+
ret = bitmap_writer_build(&writer);
850850
if (ret < 0)
851851
goto cleanup;
852852

pack-bitmap-write.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,7 @@ static void store_selected(struct bitmap_writer *writer,
569569
kh_value(writer->bitmaps, hash_pos) = stored;
570570
}
571571

572-
int bitmap_writer_build(struct bitmap_writer *writer,
573-
struct packing_data *to_pack)
572+
int bitmap_writer_build(struct bitmap_writer *writer)
574573
{
575574
struct bitmap_builder bb;
576575
size_t i;
@@ -581,17 +580,15 @@ int bitmap_writer_build(struct bitmap_writer *writer,
581580
uint32_t *mapping;
582581
int closed = 1; /* until proven otherwise */
583582

584-
writer->to_pack = to_pack;
585-
586583
if (writer->show_progress)
587584
writer->progress = start_progress("Building bitmaps",
588585
writer->selected_nr);
589586
trace2_region_enter("pack-bitmap-write", "building_bitmaps_total",
590587
the_repository);
591588

592-
old_bitmap = prepare_bitmap_git(to_pack->repo);
589+
old_bitmap = prepare_bitmap_git(writer->to_pack->repo);
593590
if (old_bitmap)
594-
mapping = create_bitmap_mapping(old_bitmap, to_pack);
591+
mapping = create_bitmap_mapping(old_bitmap, writer->to_pack);
595592
else
596593
mapping = NULL;
597594

pack-bitmap.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ struct ewah_bitmap *pseudo_merge_bitmap_for_commit(struct bitmap_index *bitmap_g
146146
void bitmap_writer_select_commits(struct bitmap_writer *writer,
147147
struct commit **indexed_commits,
148148
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);
151150
void bitmap_writer_finish(struct bitmap_writer *writer,
152151
struct pack_idx_entry **index,
153152
uint32_t index_nr,

0 commit comments

Comments
 (0)