In "open_pack_bitmap_1()" and "open_midx_bitmap_1()", it's better to return error() instead of "-1" when some unexpected error occurs like "stat bitmap file failed", "bitmap header is invalid" or "checksum mismatch", etc. There are places where we do not replace, such as when the bitmap does not exist (no bitmap in repository is allowed) or when another bitmap has already been opened (in which case it should be a warning rather than an error). Signed-off-by: Teng Long <dyroneteng@xxxxxxxxx> --- pack-bitmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index a1d06c4252..e0dcd06db3 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -328,7 +328,7 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git, trace2_data_string("midx", the_repository, "stat bitmap file", "failed"); close(fd); - return -1; + return error("cannot stat bitmap file"); } if (bitmap_git->pack || bitmap_git->midx) { @@ -374,7 +374,7 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git, bitmap_git->map_pos = 0; bitmap_git->map = NULL; bitmap_git->midx = NULL; - return -1; + return error("cannot open midx bitmap file"); } static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git *packfile) @@ -399,7 +399,7 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git trace2_data_string("bitmap", the_repository, "stat bitmap file", "failed"); close(fd); - return -1; + return error("cannot stat bitmap file"); } if (bitmap_git->pack || bitmap_git->midx) { @@ -413,7 +413,7 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git if (!is_pack_valid(packfile)) { trace2_data_string("bitmap", the_repository, "packfile", "invalid"); close(fd); - return -1; + return error("packfile is invalid"); } bitmap_git->pack = packfile; @@ -430,7 +430,7 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git bitmap_git->map_size = 0; bitmap_git->map_pos = 0; bitmap_git->pack = NULL; - return -1; + return error("bitmap header is invalid"); } return 0; -- 2.35.1.583.g30faa5f068