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>

diff --git a/commit.c b/commit.c
index dd8c9c15b1453a999c024623b8141453732c4877..15b044331a16d6f20abe23b14a2499a090fb9140 100644 (file)
--- 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;
 }
 
        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(
 {
        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;
        if (!v) {
                if (sizep)
                        *sizep = 0;

diff --git a/commit.h b/commit.h
index 7297af467b9e28308063d9ce5aeabef14dcfb61f..d61585df5bc6ef18e3e323e38675dc2ad059f236 100644 (file)
--- 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.
  */
  * 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
 
 /*
  * Get the commit's object contents, either from cache or by reading the object