From: John Cai <johncai86@xxxxxxxxx> Since find_commit_header's logic is not just limited to commit objects, we can rename this to a more general find_header function so it's clearer that it can be used in a more general way. Signed-off-by: John Cai <johncai86@xxxxxxxxx> --- builtin/am.c | 2 +- builtin/commit.c | 2 +- builtin/receive-pack.c | 8 ++++---- commit.c | 4 ++-- commit.h | 2 +- gpg-interface.c | 2 +- pretty.c | 2 +- sequencer.c | 2 +- t/helper/test-fast-rebase.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 8677ea2348a..1ed5071ff49 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1312,7 +1312,7 @@ static void get_commit_info(struct am_state *state, struct commit *commit) buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding()); - ident_line = find_commit_header(buffer, "author", &ident_len); + ident_line = find_header(buffer, "author", &ident_len); if (!ident_line) die(_("missing author line in commit %s"), oid_to_hex(&commit->object.oid)); diff --git a/builtin/commit.c b/builtin/commit.c index 883c16256c8..6fbb154ee32 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -614,7 +614,7 @@ static void determine_author_info(struct strbuf *author_ident) size_t len; const char *a; - a = find_commit_header(author_message_buffer, "author", &len); + a = find_header(author_message_buffer, "author", &len); if (!a) die(_("commit '%s' lacks author header"), author_message); if (split_ident_line(&ident, a, len) < 0) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 939d4b28b7c..f0fc826b665 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -581,13 +581,13 @@ static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) return strbuf_detach(&buf, NULL); } -static char *find_header_value(const char *msg, const char *key, const char **next_line) +static char *find_header_nextline(const char *msg, const char *key, const char **next_line) { size_t out_len; const char *eol; char *ret; - const char *val = find_commit_header(msg, key, &out_len); + const char *val = find_header(msg, key, &out_len); if (val == NULL) return NULL; @@ -619,7 +619,7 @@ static int constant_memequal(const char *a, const char *b, size_t n) static const char *check_nonce(const char *buf, size_t len) { - char *nonce = find_header_value(buf, "nonce", NULL); + char *nonce = find_header_nextline(buf, "nonce", NULL); timestamp_t stamp, ostamp; char *bohmac, *expect = NULL; @@ -725,7 +725,7 @@ static int check_cert_push_options(const struct string_list *push_options) if (!len) return 1; - while ((option = find_header_value(buf, "push-option", &next_line))) { + while ((option = find_header_nextline(buf, "push-option", &next_line))) { buf = next_line; options_seen++; if (options_seen > push_options->nr diff --git a/commit.c b/commit.c index 616a6780703..bdedbe295f5 100644 --- a/commit.c +++ b/commit.c @@ -734,7 +734,7 @@ void record_author_date(struct author_date_slab *author_date, char *date_end; timestamp_t date; - ident_line = find_commit_header(buffer, "author", &ident_len); + ident_line = find_header(buffer, "author", &ident_len); if (!ident_line) goto fail_exit; /* no author line */ if (split_ident_line(&ident, ident_line, ident_len) || @@ -1631,7 +1631,7 @@ struct commit_list **commit_list_append(struct commit *commit, return &new_commit->next; } -const char *find_commit_header(const char *msg, const char *key, size_t *out_len) +const char *find_header(const char *msg, const char *key, size_t *out_len) { int key_len = strlen(key); const char *line = msg; diff --git a/commit.h b/commit.h index 3ea32766bcb..18a1460c4b4 100644 --- a/commit.h +++ b/commit.h @@ -296,7 +296,7 @@ void free_commit_extra_headers(struct commit_extra_header *extra); * Note that some headers (like mergetag) may be multi-line. It is the caller's * responsibility to parse further in this case! */ -const char *find_commit_header(const char *msg, const char *key, +const char *find_header(const char *msg, const char *key, size_t *out_len); /* Find the end of the log message, the right place for a new trailer. */ diff --git a/gpg-interface.c b/gpg-interface.c index b52eb0e2e04..c1bc9fa0459 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -597,7 +597,7 @@ static int parse_payload_metadata(struct signature_check *sigc) BUG("invalid value for sigc->payload_type"); } - ident_line = find_commit_header(sigc->payload, signer_header, &ident_len); + ident_line = find_header(sigc->payload, signer_header, &ident_len); if (!ident_line || !ident_len) return 1; diff --git a/pretty.c b/pretty.c index ee6114e3f0a..306c647d2d7 100644 --- a/pretty.c +++ b/pretty.c @@ -633,7 +633,7 @@ static void add_merge_info(const struct pretty_print_context *pp, static char *get_header(const char *msg, const char *key) { size_t len; - const char *v = find_commit_header(msg, key, &len); + const char *v = find_header(msg, key, &len); return v ? xmemdupz(v, len) : NULL; } diff --git a/sequencer.c b/sequencer.c index e314af4d60a..ac535868121 100644 --- a/sequencer.c +++ b/sequencer.c @@ -912,7 +912,7 @@ static char *get_author(const char *message) size_t len; const char *a; - a = find_commit_header(message, "author", &len); + a = find_header(message, "author", &len); if (a) return xmemdupz(a, len); diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c index fc2d4609043..576c2366258 100644 --- a/t/helper/test-fast-rebase.c +++ b/t/helper/test-fast-rebase.c @@ -44,7 +44,7 @@ static char *get_author(const char *message) size_t len; const char *a; - a = find_commit_header(message, "author", &len); + a = find_header(message, "author", &len); if (a) return xmemdupz(a, len); -- gitgitgadget