commit: add repository argument to get_cached_commit_buffer

stefanbeller · gitster · commit 3ce85f7e5a41 · 2018-06-29T10:43:39.000-07:00
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 &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/commit.c b/commit.c
@@ -269,7 +269,7 @@ void set_commit_buffer_the_repository(struct commit *commit, void *buffer, unsig
 	v->size = size;
 }
 
-const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
+const void *get_cached_commit_buffer_the_repository(const struct commit *commit, unsigned long *sizep)
 {
 	struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
 	if (!v) {
@@ -284,7 +284,7 @@ const void *get_cached_commit_buffer(const struct commit *commit, unsigned long
 
 const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
 {
-	const void *ret = get_cached_commit_buffer(commit, sizep);
+	const void *ret = get_cached_commit_buffer(the_repository, commit, sizep);
 	if (!ret) {
 		enum object_type type;
 		unsigned long size;
diff --git a/commit.h b/commit.h
@@ -102,7 +102,8 @@ void set_commit_buffer_the_repository(struct commit *, void *buffer, unsigned lo
  * Get any cached object buffer associated with the commit. Returns NULL
  * if none. The resulting memory should not be freed.
  */
-const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
+#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);
 
 /*
  * Get the commit's object contents, either from cache or by reading the object
diff --git a/object.c b/object.c
@@ -216,7 +216,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e
 		if (commit) {
 			if (parse_commit_buffer(the_repository, commit, buffer, size, 1))
 				return NULL;
-			if (!get_cached_commit_buffer(commit, NULL)) {
+			if (!get_cached_commit_buffer(the_repository, commit, NULL)) {
 				set_commit_buffer(the_repository, commit, buffer, size);
 				*eaten_p = 1;
 			}
diff --git a/pretty.c b/pretty.c
@@ -630,7 +630,7 @@ const char *logmsg_reencode(const struct commit *commit,
 		 * the cached copy from get_commit_buffer, we need to duplicate it
 		 * to avoid munging the cached copy.
 		 */
-		if (msg == get_cached_commit_buffer(commit, NULL))
+		if (msg == get_cached_commit_buffer(the_repository, commit, NULL))
 			out = xstrdup(msg);
 		else
 			out = (char *)msg;

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ void set_commit_buffer_the_repository(struct commit commit, void buffer, unsig`
`269`	`269`	`v->size = size;`
`270`	`270`	`}`
`271`	`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`	`273`	`{`
`274`	`274`	`struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);`
`275`	`275`	`if (!v) {`
`@@ -284,7 +284,7 @@ const void get_cached_commit_buffer(const struct commit commit, unsigned long`
`284`	`284`
`285`	`285`	`const void get_commit_buffer(const struct commit commit, unsigned long *sizep)`
`286`	`286`	`{`
`287`		`- const void *ret = get_cached_commit_buffer(commit, sizep);`
	`287`	`+ const void *ret = get_cached_commit_buffer(the_repository, commit, sizep);`
`288`	`288`	`if (!ret) {`
`289`	`289`	`enum object_type type;`
`290`	`290`	`unsigned long size;`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ struct object parse_object_buffer_the_repository(const struct object_id oid, e`
`216`	`216`	`if (commit) {`
`217`	`217`	`if (parse_commit_buffer(the_repository, commit, buffer, size, 1))`
`218`	`218`	`return NULL;`
`219`		`- if (!get_cached_commit_buffer(commit, NULL)) {`
	`219`	`+ if (!get_cached_commit_buffer(the_repository, commit, NULL)) {`
`220`	`220`	`set_commit_buffer(the_repository, commit, buffer, size);`
`221`	`221`	`*eaten_p = 1;`
`222`	`222`	`}`