Re: [PATCH 4/5] commit: implement free_commit_graft
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 15, 2017, 18:26 UTC
- Message-ID
- <xmqqshgsr8kn.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <945cc94bedab645885f9025cee51efd8205a69a4.1502796628.git.patryk.obara@gmail.com>
Patryk Obara <patryk.obara@gmail.com> writes:
Show 5 quoted lines
> Signed-off-by: Patryk Obara <patryk.obara@gmail.com> > --- > commit.c | 11 ++++++++--- > commit.h | 1 + > 2 files changed, 9 insertions(+), 3 deletions(-)
I do not see a need to make this new function extern. Shouldn't it be made "static" and revert the change to commit.h?
Show 48 quoted lines
> diff --git a/commit.c b/commit.c
> index 499fb14..6a145f1 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -109,15 +109,20 @@ static int commit_graft_pos(const unsigned char *sha1)
> commit_graft_sha1_access);
> }
>
> +void free_commit_graft(struct commit_graft *graft)
> +{
> + free(graft);
> +}
> +
> int register_commit_graft(struct commit_graft *graft, int ignore_dups)
> {
> int pos = commit_graft_pos(graft->oid.hash);
>
> if (0 <= pos) {
> if (ignore_dups)
> - free(graft);
> + free_commit_graft(graft);
> else {
> - free(commit_graft[pos]);
> + free_commit_graft(commit_graft[pos]);
> commit_graft[pos] = graft;
> }
> return 1;
> @@ -163,7 +168,7 @@ struct commit_graft *read_graft_line(struct strbuf *line)
>
> bad_graft_data:
> error("bad graft data: %s", buf);
> - free(graft);
> + free_commit_graft(graft);
> return NULL;
> }
>
> diff --git a/commit.h b/commit.h
> index baecc0a..c1b319f 100644
> --- a/commit.h
> +++ b/commit.h
> @@ -247,6 +247,7 @@ struct commit_graft {
> };
> typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
>
> +void free_commit_graft(struct commit_graft *);
> struct commit_graft *read_graft_line(struct strbuf *line);
> int register_commit_graft(struct commit_graft *, int);
> struct commit_graft *lookup_commit_graft(const struct object_id *oid);