[PATCH 4/8] pretty.c: inline initalize format_context
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Nov 4, 2019, 20:03 UTC
- Message-ID
- <1551e903225bb4f7652341382d0c1cf71b9bd7d4.1572897736.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1572897736.git.liu.denton@gmail.com>
Instead of memsetting and then initializing the fields in the struct, move the initialization of `format_context` to its assignment.
In preparation for a future commit where we mechanically move lines from repo_format_commit_message() into a helper function, `format_context.wrap_start` is not generically used so move its assignment closer to its use.
Signed-off-by: Denton Liu <liu.denton@gmail.com> --- pretty.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pretty.c b/pretty.c index b32f036953..6f2b0ad917 100644 --- a/pretty.c +++ b/pretty.c @@ -1610,14 +1610,13 @@ void repo_format_commit_message(struct repository *r, const char *format, struct strbuf *sb, const struct pretty_print_context *pretty_ctx) { - struct format_commit_context context; + struct format_commit_context context = { + .commit = commit, + .pretty_ctx = pretty_ctx + }; const char *output_enc = pretty_ctx->output_encoding; const char *utf8 = "UTF-8"; - memset(&context, 0, sizeof(context)); - context.commit = commit; - context.pretty_ctx = pretty_ctx; - context.wrap_start = sb->len; /* * convert a commit message to UTF-8 first * as far as 'format_commit_item' assumes it in UTF-8 @@ -1626,6 +1625,7 @@ void repo_format_commit_message(struct repository *r, &context.commit_encoding, utf8); + context.wrap_start = sb->len; strbuf_expand(sb, format, format_commit_item, &context); rewrap_message_tail(sb, &context, 0, 0, 0);
-- 2.24.0.rc2.262.g2d07a97ef5