[PATCH 11/11] packfile: allow find_pack_entry to handle arbitrary repositories

[Stefan Beller]

Signed-off-by: Stefan Beller <sbel...@google.com>
---
 packfile.c | 10 +++++-----
 packfile.h |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packfile.c b/packfile.c
index e16f8252233..399c59e640f 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1835,18 +1835,18 @@ static int fill_pack_entry(const unsigned char *sha1,
        return 1;
 }
 
-int find_pack_entry_the_repository(const unsigned char *sha1, struct 
pack_entry *e)
+int find_pack_entry(struct repository *r, const unsigned char *sha1, struct 
pack_entry *e)
 {
        struct list_head *pos;
 
-       prepare_packed_git(the_repository);
-       if (!the_repository->objects.packed_git)
+       prepare_packed_git(r);
+       if (!r->objects.packed_git)
                return 0;
 
-       list_for_each(pos, &the_repository->objects.packed_git_mru) {
+       list_for_each(pos, &r->objects.packed_git_mru) {
                struct packed_git *p = list_entry(pos, struct packed_git, mru);
                if (fill_pack_entry(sha1, e, p)) {
-                       list_move(&p->mru, 
&the_repository->objects.packed_git_mru);
+                       list_move(&p->mru, &r->objects.packed_git_mru);
                        return 1;
                }
        }
diff --git a/packfile.h b/packfile.h
index feeabd6f031..6f7b9e91d66 100644
--- a/packfile.h
+++ b/packfile.h
@@ -124,8 +124,7 @@ extern const struct packed_git *has_packed_and_bad(const 
unsigned char *sha1);
  * Iff a pack file in the given repository contains the object named by sha1,
  * return true and store its location to e.
  */
-#define find_pack_entry(r, s, e) find_pack_entry_##r(s, e)
-extern int find_pack_entry_the_repository(const unsigned char *sha1, struct 
pack_entry *e);
+extern int find_pack_entry(struct repository *r, const unsigned char *sha1, 
struct pack_entry *e);
 
 extern int has_sha1_pack(const unsigned char *sha1);
 
-- 
2.16.2.395.g2e18187dfd-goog