summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2024-06-19 19:13:19 +0200
committerJunio C Hamano <gitster@pobox.com>2024-06-20 11:12:40 -0700
commit28dc26dc337932d9e4df8f83f1e454ea6bbc0897 (patch)
tree0c77d98785e4a751492e2c6cdd817b5ba3154230 /commit.c
parent020456cb744b16f686d9220eb4b95a8e157c3485 (diff)
commit: remove find_header_mem()
cfc5cf428b (receive-pack.c: consolidate find header logic, 2022-01-06) introduced find_header_mem() and turned find_commit_header() into a thin wrapper. Since then, the latter has become the last remaining caller of the former. Remove it to restore find_commit_header() to the state before cfc5cf428b, get rid of a strlen(3) call and resolve a NEEDSWORK note in the process. Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/commit.c b/commit.c
index ef679a0b93..4c69d050a6 100644
--- a/commit.c
+++ b/commit.c
@@ -1737,20 +1737,12 @@ struct commit_list **commit_list_append(struct commit *commit,
return &new_commit->next;
}
-const char *find_header_mem(const char *msg, size_t len,
- const char *key, size_t *out_len)
+const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
{
int key_len = strlen(key);
const char *line = msg;
- /*
- * NEEDSWORK: It's possible for strchrnul() to scan beyond the range
- * given by len. However, current callers are safe because they compute
- * len by scanning a NUL-terminated block of memory starting at msg.
- * Nonetheless, it would be better to ensure the function does not look
- * at msg beyond the len provided by the caller.
- */
- while (line && line < msg + len) {
+ while (line) {
const char *eol = strchrnul(line, '\n');
if (line == eol)
@@ -1767,10 +1759,6 @@ const char *find_header_mem(const char *msg, size_t len,
return NULL;
}
-const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
-{
- return find_header_mem(msg, strlen(msg), key, out_len);
-}
/*
* Inspect the given string and determine the true "end" of the log message, in
* order to find where to put a new Signed-off-by trailer. Ignored are