pack-bitmap: drop redundant args from `bitmap_writer_build_type_index()`
The previous commit ensures that the bitmap_writer's "to_pack" field is initialized early on, so the "to_pack" and "index_nr" arguments to `bitmap_writer_build_type_index()` are redundant. Drop them and adjust the callers accordingly. 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
125ee4ae80e3661c3208fc1c8db0c619e5f625d2
4 files changed
+8
-13
builtin/pack-objects.c
+1
-1
@@ -1345,7 +1345,7 @@ static void write_pack_file(void)
1345
the_repository, &to_pack);
1346
bitmap_writer_set_checksum(&bitmap_writer, hash);
1347
bitmap_writer_build_type_index(&bitmap_writer,
1348
- &to_pack, written_list, nr_written);
1348
+ written_list);
1349
}
1350
1351
if (cruft)
midx-write.c
+1
-2
@@ -827,8 +827,7 @@ static int write_midx_bitmap(const char *midx_name,
827
828
bitmap_writer_init(&writer, the_repository, pdata);
829
bitmap_writer_show_progress(&writer, flags & MIDX_PROGRESS);
830
- bitmap_writer_build_type_index(&writer, pdata, index,
831
- pdata->nr_objects);
830
+ bitmap_writer_build_type_index(&writer, index);
831
832
/*
833
* bitmap_writer_finish expects objects in lex order, but pack_order
pack-bitmap-write.c
+5
-7
@@ -101,9 +101,7 @@ void bitmap_writer_show_progress(struct bitmap_writer *writer, int show)
101
* Build the initial type index for the packfile or multi-pack-index
102
*/
103
void bitmap_writer_build_type_index(struct bitmap_writer *writer,
104
- struct packing_data *to_pack,
105
- struct pack_idx_entry **index,
106
- uint32_t index_nr)
104
+ struct pack_idx_entry **index)
105
{
106
uint32_t i;
107
@@ -111,13 +109,13 @@ void bitmap_writer_build_type_index(struct bitmap_writer *writer,
109
writer->trees = ewah_new();
110
writer->blobs = ewah_new();
111
writer->tags = ewah_new();
114
- ALLOC_ARRAY(to_pack->in_pack_pos, to_pack->nr_objects);
112
+ ALLOC_ARRAY(writer->to_pack->in_pack_pos, writer->to_pack->nr_objects);
113
116
- for (i = 0; i < index_nr; ++i) {
114
+ for (i = 0; i < writer->to_pack->nr_objects; ++i) {
115
struct object_entry *entry = (struct object_entry *)index[i];
116
enum object_type real_type;
117
120
- oe_set_in_pack_pos(to_pack, entry, i);
118
+ oe_set_in_pack_pos(writer->to_pack, entry, i);
119
120
switch (oe_type(entry)) {
121
case OBJ_COMMIT:
@@ -128,7 +126,7 @@ void bitmap_writer_build_type_index(struct bitmap_writer *writer,
126
break;
127
128
default:
131
- real_type = oid_object_info(to_pack->repo,
129
+ real_type = oid_object_info(writer->to_pack->repo,
130
&entry->idx.oid, NULL);
131
break;
132
}
pack-bitmap.h
+1
-3
@@ -129,9 +129,7 @@ void bitmap_writer_show_progress(struct bitmap_writer *writer, int show);
129
void bitmap_writer_set_checksum(struct bitmap_writer *writer,
130
const unsigned char *sha1);
131
void bitmap_writer_build_type_index(struct bitmap_writer *writer,
132
- struct packing_data *to_pack,
133
- struct pack_idx_entry **index,
134
- uint32_t index_nr);
132
+ struct pack_idx_entry **index);
133
int bitmap_writer_has_bitmapped_object_id(struct bitmap_writer *writer,
134
const struct object_id *oid);
135
void bitmap_writer_push_commit(struct bitmap_writer *writer,