packfile: rename `packfile_store_get_all_packs()`

In a preceding commit we have removed `packfile_store_get_packs()`. With
this function removed it's somewhat useless to still have the "all"
infix in `packfile_store_get_all_packs()`. Rename the latter to drop
that infix.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index b1d5549815ac66b773ad4c1592b34f9a8d590ee2..fea914cf9eb7f265195a9cc9135d92f507017154 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -976,7 +976,7 @@ static int store_object(
        if (e->idx.offset) {
                duplicate_count_by_type[type]++;
                return 1;
-       } else if (find_oid_pack(&oid, packfile_store_get_all_packs(packs))) {
+       } else if (find_oid_pack(&oid, packfile_store_get_packs(packs))) {
                e->type = type;
                e->pack_id = MAX_PACK_ID;
                e->idx.offset = 1; /* just not zero! */
@@ -1177,7 +1177,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
                duplicate_count_by_type[OBJ_BLOB]++;
                truncate_pack(&checkpoint);
 
-       } else if (find_oid_pack(&oid, packfile_store_get_all_packs(packs))) {
+       } else if (find_oid_pack(&oid, packfile_store_get_packs(packs))) {
                e->type = OBJ_BLOB;
                e->pack_id = MAX_PACK_ID;
                e->idx.offset = 1; /* just not zero! */

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 50618e1073ed99adf41c6a55bf2c2c0de95e1559..3a19bddd574ef219ebbabb1cfcd0cced77267fd1 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -4394,7 +4394,7 @@ static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
        struct packed_git *p;
 
        p = (last_found != (void *)1) ? last_found :
-                                       packfile_store_get_all_packs(packs);
+                                       packfile_store_get_packs(packs);
 
        while (p) {
                if ((!p->pack_local || p->pack_keep ||
@@ -4404,7 +4404,7 @@ static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
                        return 1;
                }
                if (p == last_found)
-                       p = packfile_store_get_all_packs(packs);
+                       p = packfile_store_get_packs(packs);
                else
                        p = p->next;
                if (p == last_found)

diff --git a/packfile.c b/packfile.c
index ab5859518d45ea17a434dd2258c0882679886cec..1ae2b2fe1eda77a57f007f78726724bd26f6a743 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1027,7 +1027,7 @@ void packfile_store_reprepare(struct packfile_store *store)
        packfile_store_prepare(store);
 }
 
-struct packed_git *packfile_store_get_all_packs(struct packfile_store *store)
+struct packed_git *packfile_store_get_packs(struct packfile_store *store)
 {
        packfile_store_prepare(store);
 

diff --git a/packfile.h b/packfile.h
index 49484a9b09b5816b1ac21eb423b837471c05467a..c9d0b93446b5f569aadb12f48fce8ffc6aace59d 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -142,13 +142,13 @@ void packfile_store_add_pack(struct packfile_store *store,
  * repository.
  */
 #define repo_for_each_pack(repo, p) \
-       for (p = packfile_store_get_all_packs(repo->objects->packfiles); p; p = p->next)
+       for (p = packfile_store_get_packs(repo->objects->packfiles); p; p = p->next)
 
 /*
  * Get all packs managed by the given store, including packfiles that are
  * referenced by multi-pack indices.
  */
-struct packed_git *packfile_store_get_all_packs(struct packfile_store *store);
+struct packed_git *packfile_store_get_packs(struct packfile_store *store);
 
 /*
  * Get all packs in most-recently-used order.