commit: add repository argument to get_cached_commit_buffer
Add a repository argument to allow callers of get_cached_commit_buffer to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Jun 28, 2018 at 18:22 UTC
3ce85f7e5a41116145179f0fae2ce6d86558d099
4 files changed
+6
-5
commit.c
+2
-2
@@ -269,7 +269,7 @@ void set_commit_buffer_the_repository(struct commit *commit, void *buffer, unsig
269
v->size = size;
270
}
271
272
-const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
272
+const void *get_cached_commit_buffer_the_repository(const struct commit *commit, unsigned long *sizep)
273
{
274
struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
275
if (!v) {
@@ -284,7 +284,7 @@ const void *get_cached_commit_buffer(const struct commit *commit, unsigned long
284
285
const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
286
{
287
- const void *ret = get_cached_commit_buffer(commit, sizep);
287
+ const void *ret = get_cached_commit_buffer(the_repository, commit, sizep);
288
if (!ret) {
289
enum object_type type;
290
unsigned long size;
commit.h
+2
-1
@@ -102,7 +102,8 @@ void set_commit_buffer_the_repository(struct commit *, void *buffer, unsigned lo
102
* Get any cached object buffer associated with the commit. Returns NULL
103
* if none. The resulting memory should not be freed.
104
*/
105
-const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
105
+#define get_cached_commit_buffer(r, c, s) get_cached_commit_buffer_##r(c, s)
106
+const void *get_cached_commit_buffer_the_repository(const struct commit *, unsigned long *size);
107
108
/*
109
* Get the commit's object contents, either from cache or by reading the object
object.c
+1
-1
@@ -216,7 +216,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e
216
if (commit) {
217
if (parse_commit_buffer(the_repository, commit, buffer, size, 1))
218
return NULL;
219
- if (!get_cached_commit_buffer(commit, NULL)) {
219
+ if (!get_cached_commit_buffer(the_repository, commit, NULL)) {
220
set_commit_buffer(the_repository, commit, buffer, size);
221
*eaten_p = 1;
222
}
pretty.c
+1
-1
@@ -630,7 +630,7 @@ const char *logmsg_reencode(const struct commit *commit,
630
* the cached copy from get_commit_buffer, we need to duplicate it
631
* to avoid munging the cached copy.
632
*/
633
- if (msg == get_cached_commit_buffer(commit, NULL))
633
+ if (msg == get_cached_commit_buffer(the_repository, commit, NULL))
634
out = xstrdup(msg);
635
else
636
out = (char *)msg;