pack-bitmap: drop `_1` suffix from functions that open bitmaps
In the preceding commit we've refactored how we open bitmaps. As part of the refactoring we have consolidated `open_pack_bitmap()` as well as `open_midx_bitmap()` into `open_bitmap_for_source()`. Consequently, we only have their `open_pack_bitmap_1()` and `open_midx_bitmap_1()` variants left over, where the `_1` suffix doesn't really make much sense anymore. Drop the suffix. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Jul 15, 2026 at 08:22 UTC
db95bfc121aa9725e8128d7b1dd73330c0beb7f9
1 file changed
+7
-7
pack-bitmap.c
+7
-7
@@ -460,8 +460,8 @@ char *pack_bitmap_filename(struct packed_git *p)
460
return xstrfmt("%.*s.bitmap", (int)len, p->pack_name);
461
}
462
463
-static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
464
- struct multi_pack_index *midx)
463
+static int open_midx_bitmap(struct bitmap_index *bitmap_git,
464
+ struct multi_pack_index *midx)
465
{
466
struct stat st;
467
char *bitmap_name = midx_bitmap_filename(midx);
@@ -539,7 +539,7 @@ cleanup:
539
return -1;
540
}
541
542
-static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git *packfile)
542
+static int open_pack_bitmap(struct bitmap_index *bitmap_git, struct packed_git *packfile)
543
{
544
int fd;
545
struct stat st;
@@ -603,7 +603,7 @@ static int load_reverse_index(struct repository *r, struct bitmap_index *bitmap_
603
604
/*
605
* The multi-pack-index's .rev file is already loaded via
606
- * open_pack_bitmap_1().
606
+ * open_pack_bitmap().
607
*
608
* But we still need to open the individual pack .rev files,
609
* since we will need to make use of them in pack-objects.
@@ -687,7 +687,7 @@ static int open_bitmap_for_source(struct odb_source_packed *source,
687
struct packfile_list_entry *e;
688
bool found = false;
689
690
- if (midx && !open_midx_bitmap_1(bitmap_git, midx))
690
+ if (midx && !open_midx_bitmap(bitmap_git, midx))
691
found = true;
692
693
for (e = packfile_store_get_packs(source); e; e = e->next) {
@@ -698,7 +698,7 @@ static int open_bitmap_for_source(struct odb_source_packed *source,
698
if (found && !trace2_is_enabled())
699
break;
700
701
- if (!open_pack_bitmap_1(bitmap_git, e->pack))
701
+ if (!open_pack_bitmap(bitmap_git, e->pack))
702
found = true;
703
}
704
@@ -746,7 +746,7 @@ struct bitmap_index *prepare_midx_bitmap_git(struct multi_pack_index *midx)
746
{
747
struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
748
749
- if (!open_midx_bitmap_1(bitmap_git, midx))
749
+ if (!open_midx_bitmap(bitmap_git, midx))
750
return bitmap_git;
751
752
free_bitmap_index(bitmap_git);