packfile: inline `find_kept_pack_entry()`

The `find_kept_pack_entry()` function is only used in
`has_object_kept_pack()`, which is only a trivial wrapper itself. Inline
the latter into the former.

Furthermore, reorder the code so that we can drop the declaration of the
function in "packfile.h". This allows us to make the function file-local.

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

diff --git a/packfile.c b/packfile.c
index 23d8f7cb938ccad34b458a07c37e2d76f2ddd88a..3bce1b150d5b940eb43cee2f177dd6d7e8fa877e 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -2215,12 +2215,17 @@ struct packed_git **packfile_store_get_kept_pack_cache(struct packfile_store *st
        return store->kept_cache.packs;
 }
 
-int find_kept_pack_entry(struct repository *r,
-                        const struct object_id *oid,
-                        unsigned flags,
-                        struct pack_entry *e)
+int has_object_pack(struct repository *r, const struct object_id *oid)
+{
+       struct pack_entry e;
+       return find_pack_entry(r, oid, &e);
+}
+
+int has_object_kept_pack(struct repository *r, const struct object_id *oid,
+                        unsigned flags)
 {
        struct odb_source *source;
+       struct pack_entry e;
 
        for (source = r->objects->sources; source; source = source->next) {
                struct packed_git **cache;
@@ -2229,7 +2234,7 @@ int find_kept_pack_entry(struct repository *r,
 
                for (; *cache; cache++) {
                        struct packed_git *p = *cache;
-                       if (fill_pack_entry(oid, e, p))
+                       if (fill_pack_entry(oid, &e, p))
                                return 1;
                }
        }
@@ -2237,19 +2242,6 @@ int find_kept_pack_entry(struct repository *r,
        return 0;
 }
 
-int has_object_pack(struct repository *r, const struct object_id *oid)
-{
-       struct pack_entry e;
-       return find_pack_entry(r, oid, &e);
-}
-
-int has_object_kept_pack(struct repository *r, const struct object_id *oid,
-                        unsigned flags)
-{
-       struct pack_entry e;
-       return find_kept_pack_entry(r, oid, flags, &e);
-}
-
 int for_each_object_in_pack(struct packed_git *p,
                            each_packed_object_fn cb, void *data,
                            enum for_each_object_flags flags)

diff --git a/packfile.h b/packfile.h
index 07f7cdbad13491dabf7e0ba7451a1c17bf4618c9..08a666d538213ef5e500e345afe7377deb51c0d6 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -445,12 +445,6 @@ int packed_object_info(struct repository *r,
 void mark_bad_packed_object(struct packed_git *, const struct object_id *);
 const struct packed_git *has_packed_and_bad(struct repository *, const struct object_id *);
 
-/*
- * Iff a pack file in the given repository contains the object named by sha1,
- * return true and store its location to e.
- */
-int find_kept_pack_entry(struct repository *r, const struct object_id *oid, unsigned flags, struct pack_entry *e);
-
 int has_object_pack(struct repository *r, const struct object_id *oid);
 int has_object_kept_pack(struct repository *r, const struct object_id *oid,
                         unsigned flags);