summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-06-28 18:22:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-29 10:43:40 -0700
commit4ff7e5c9362875b2296fd2e289dba487a38609f0 (patch)
tree2e6cd6f4189ea0bfdd3ad3e6c8d11b7c6033efc2
parentcommit.c: allow set_commit_buffer to handle arbitrary repositories (diff)
downloadtgif-4ff7e5c9362875b2296fd2e289dba487a38609f0.tar.xz
commit.c: allow get_cached_commit_buffer to handle arbitrary repositories
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--commit.c4
-rw-r--r--commit.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/commit.c b/commit.c
index dd8c9c15b1..15b044331a 100644
--- a/commit.c
+++ b/commit.c
@@ -283,10 +283,10 @@ void set_commit_buffer(struct repository *r, struct commit *commit, void *buffer
v->size = size;
}
-const void *get_cached_commit_buffer_the_repository(const struct commit *commit, unsigned long *sizep)
+const void *get_cached_commit_buffer(struct repository *r, const struct commit *commit, unsigned long *sizep)
{
struct commit_buffer *v = buffer_slab_peek(
- the_repository->parsed_objects->buffer_slab, commit);
+ r->parsed_objects->buffer_slab, commit);
if (!v) {
if (sizep)
*sizep = 0;
diff --git a/commit.h b/commit.h
index 7297af467b..d61585df5b 100644
--- a/commit.h
+++ b/commit.h
@@ -103,8 +103,7 @@ void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsi
* Get any cached object buffer associated with the commit. Returns NULL
* if none. The resulting memory should not be freed.
*/
-#define get_cached_commit_buffer(r, c, s) get_cached_commit_buffer_##r(c, s)
-const void *get_cached_commit_buffer_the_repository(const struct commit *, unsigned long *size);
+const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
/*
* Get the commit's object contents, either from cache or by reading the object