Skip to content

Commit 2c2ddfb

Browse files
committed
Merge branch 'rs/remove-unused-find-header-mem' into maint-2.45
Code clean-up. * rs/remove-unused-find-header-mem: commit: remove find_header_mem()
2 parents ae46703 + 28dc26d commit 2c2ddfb

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

commit.c

+2-14
Original file line numberDiff line numberDiff line change
@@ -1869,20 +1869,12 @@ struct commit_list **commit_list_append(struct commit *commit,
18691869
return &new_commit->next;
18701870
}
18711871

1872-
const char *find_header_mem(const char *msg, size_t len,
1873-
const char *key, size_t *out_len)
1872+
const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
18741873
{
18751874
int key_len = strlen(key);
18761875
const char *line = msg;
18771876

1878-
/*
1879-
* NEEDSWORK: It's possible for strchrnul() to scan beyond the range
1880-
* given by len. However, current callers are safe because they compute
1881-
* len by scanning a NUL-terminated block of memory starting at msg.
1882-
* Nonetheless, it would be better to ensure the function does not look
1883-
* at msg beyond the len provided by the caller.
1884-
*/
1885-
while (line && line < msg + len) {
1877+
while (line) {
18861878
const char *eol = strchrnul(line, '\n');
18871879

18881880
if (line == eol)
@@ -1899,10 +1891,6 @@ const char *find_header_mem(const char *msg, size_t len,
18991891
return NULL;
19001892
}
19011893

1902-
const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1903-
{
1904-
return find_header_mem(msg, strlen(msg), key, out_len);
1905-
}
19061894
/*
19071895
* Inspect the given string and determine the true "end" of the log message, in
19081896
* order to find where to put a new Signed-off-by trailer. Ignored are

commit.h

-5
Original file line numberDiff line numberDiff line change
@@ -280,17 +280,12 @@ void free_commit_extra_headers(struct commit_extra_header *extra);
280280

281281
/*
282282
* Search the commit object contents given by "msg" for the header "key".
283-
* Reads up to "len" bytes of "msg".
284283
* Returns a pointer to the start of the header contents, or NULL. The length
285284
* of the header, up to the first newline, is returned via out_len.
286285
*
287286
* Note that some headers (like mergetag) may be multi-line. It is the caller's
288287
* responsibility to parse further in this case!
289288
*/
290-
const char *find_header_mem(const char *msg, size_t len,
291-
const char *key,
292-
size_t *out_len);
293-
294289
const char *find_commit_header(const char *msg, const char *key,
295290
size_t *out_len);
296291

0 commit comments

Comments
 (0)