Skip to content

Commit

Permalink
commit: add repository argument to set_commit_buffer
Browse files Browse the repository at this point in the history
Add a repository argument to allow callers of set_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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
stefanbeller authored and gitster committed Jun 29, 2018
1 parent 08f4f44 commit 5e0c636
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion blame.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ static void set_commit_buffer_from_strbuf(struct commit *c, struct strbuf *sb)
{
size_t len;
void *buf = strbuf_detach(sb, &len);
set_commit_buffer(c, buf, len);
set_commit_buffer(the_repository, c, buf, len);
}

/*
Expand Down
4 changes: 2 additions & 2 deletions commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ struct commit_buffer {
define_commit_slab(buffer_slab, struct commit_buffer);
static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);

void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)
void set_commit_buffer_the_repository(struct commit *commit, void *buffer, unsigned long size)
{
struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);
v->buffer = buffer;
Expand Down Expand Up @@ -450,7 +450,7 @@ int parse_commit_gently(struct commit *item, int quiet_on_missing)
}
ret = parse_commit_buffer(the_repository, item, buffer, size, 0);
if (save_commit_buffer && !ret) {
set_commit_buffer(item, buffer, size);
set_commit_buffer(the_repository, item, buffer, size);
return 0;
}
free(buffer);
Expand Down
3 changes: 2 additions & 1 deletion commit.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ void parse_commit_or_die(struct commit *item);
* Associate an object buffer with the commit. The ownership of the
* memory is handed over to the commit, and must be free()-able.
*/
void set_commit_buffer(struct commit *, void *buffer, unsigned long size);
#define set_commit_buffer(r, c, b, s) set_commit_buffer_##r(c, b, s)
void set_commit_buffer_the_repository(struct commit *, void *buffer, unsigned long size);

/*
* Get any cached object buffer associated with the commit. Returns NULL
Expand Down
2 changes: 1 addition & 1 deletion object.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e
if (parse_commit_buffer(the_repository, commit, buffer, size, 1))
return NULL;
if (!get_cached_commit_buffer(commit, NULL)) {
set_commit_buffer(commit, buffer, size);
set_commit_buffer(the_repository, commit, buffer, size);
*eaten_p = 1;
}
obj = &commit->object;
Expand Down

0 comments on commit 5e0c636

Please sign in to comment.