mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-bitmap: drop redundant args from bitmap_writer_finish()

Browse Source 
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>
This commit is contained in:
Taylor Blau
2024-08-15 13:31:08 -04:00
committed by Junio C Hamano
parent f00dda4849
commit 11a08e8332
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pack-objects.c
View File

@ -1370,7 +1370,7 @@ static void write_pack_file(void)
if (bitmap_writer_build(&bitmap_writer) < 0) if (bitmap_writer_build(&bitmap_writer) < 0)
die(_("failed to write bitmap index")); die(_("failed to write bitmap index"));
bitmap_writer_finish(&bitmap_writer, bitmap_writer_finish(&bitmap_writer,
written_list, nr_written, written_list,
tmpname.buf, write_bitmap_options); tmpname.buf, write_bitmap_options);
bitmap_writer_free(&bitmap_writer); bitmap_writer_free(&bitmap_writer);
write_bitmap_index = 0; write_bitmap_index = 0;

3
midx-write.c
View File

@ -851,8 +851,7 @@ static int write_midx_bitmap(const char *midx_name,
goto cleanup; goto cleanup;
bitmap_writer_set_checksum(&writer, midx_hash); bitmap_writer_set_checksum(&writer, midx_hash);
bitmap_writer_finish(&writer, index, pdata->nr_objects, bitmap_name, bitmap_writer_finish(&writer, index, bitmap_name, options);
options);
cleanup: cleanup:
free(index); free(index);

8
pack-bitmap-write.c
View File

@ -998,7 +998,6 @@ void bitmap_writer_set_checksum(struct bitmap_writer *writer,
void bitmap_writer_finish(struct bitmap_writer *writer, void bitmap_writer_finish(struct bitmap_writer *writer,
struct pack_idx_entry **index, struct pack_idx_entry **index,
uint32_t index_nr,
const char *filename, const char *filename,
uint16_t options) uint16_t options)
{ {
@ -1031,12 +1030,13 @@ void bitmap_writer_finish(struct bitmap_writer *writer,
dump_bitmap(f, writer->tags); dump_bitmap(f, writer->tags);
if (options & BITMAP_OPT_LOOKUP_TABLE) if (options & BITMAP_OPT_LOOKUP_TABLE)
CALLOC_ARRAY(offsets, index_nr); CALLOC_ARRAY(offsets, writer->to_pack->nr_objects);
for (i = 0; i < bitmap_writer_nr_selected_commits(writer); i++) { for (i = 0; i < bitmap_writer_nr_selected_commits(writer); i++) {
struct bitmapped_commit *stored = &writer->selected[i]; struct bitmapped_commit *stored = &writer->selected[i];
int commit_pos = oid_pos(&stored->commit->object.oid, index, int commit_pos = oid_pos(&stored->commit->object.oid, index,
index_nr, oid_access); writer->to_pack->nr_objects,
oid_access);
if (commit_pos < 0) if (commit_pos < 0)
BUG(_("trying to write commit not in index")); BUG(_("trying to write commit not in index"));
@ -1052,7 +1052,7 @@ void bitmap_writer_finish(struct bitmap_writer *writer,
write_lookup_table(writer, f, offsets); write_lookup_table(writer, f, offsets);
if (options & BITMAP_OPT_HASH_CACHE) if (options & BITMAP_OPT_HASH_CACHE)
write_hash_cache(f, index, index_nr); write_hash_cache(f, index, writer->to_pack->nr_objects);
finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA, finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);

1
pack-bitmap.h
View File

@ -149,7 +149,6 @@ void bitmap_writer_select_commits(struct bitmap_writer *writer,
int bitmap_writer_build(struct bitmap_writer *writer); int bitmap_writer_build(struct bitmap_writer *writer);
void bitmap_writer_finish(struct bitmap_writer *writer, void bitmap_writer_finish(struct bitmap_writer *writer,
struct pack_idx_entry **index, struct pack_idx_entry **index,
uint32_t index_nr,
const char *filename, const char *filename,
uint16_t options); uint16_t options);
void bitmap_writer_free(struct bitmap_writer *writer); void bitmap_writer_free(struct bitmap_writer *writer);