From: Stefan Beller Date: Sat, 24 Feb 2018 00:47:52 GMT Subject: [PATCHv4 25/27] sha1_file: allow map_sha1_file_1 to handle arbitrary repositories Message-ID: <20180224004754.129721-26-sbeller@google.com> In-Reply-To: <20180224004754.129721-1-sbeller@google.com> From: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 73bbe3a3e88..e32f1da6b69 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -931,10 +931,8 @@ static int open_sha1_file(struct repository *r, * Map the loose object at "path" if it is not NULL, or the path found by * searching for a loose object named "sha1". */ -#define map_sha1_file_1(r, p, s, si) map_sha1_file_1_##r(p, s, si) -static void *map_sha1_file_1_the_repository(const char *path, - const unsigned char *sha1, - unsigned long *size) +static void *map_sha1_file_1(struct repository *r, const char *path, + const unsigned char *sha1, unsigned long *size) { void *map; int fd; @@ -942,7 +940,7 @@ static void *map_sha1_file_1_the_repository(const char *path, if (path) fd = git_open(path); else - fd = open_sha1_file(the_repository, sha1, &path); + fd = open_sha1_file(r, sha1, &path); map = NULL; if (fd >= 0) { struct stat st; -- 2.16.1.291.g4437f3f132-goog