mirror of
https://github.com/git/git
synced 2024-11-05 01:58:18 +00:00
Merge branch 'rs/remove-unused-find-header-mem'
Code clean-up. * rs/remove-unused-find-header-mem: commit: remove find_header_mem()
This commit is contained in:
commit
5dce36e04f
2 changed files with 2 additions and 19 deletions
16
commit.c
16
commit.c
|
@ -1870,20 +1870,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)
|
||||
|
@ -1900,10 +1892,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
|
||||
|
|
5
commit.h
5
commit.h
|
@ -280,17 +280,12 @@ void free_commit_extra_headers(struct commit_extra_header *extra);
|
|||
|
||||
/*
|
||||
* Search the commit object contents given by "msg" for the header "key".
|
||||
* Reads up to "len" bytes of "msg".
|
||||
* Returns a pointer to the start of the header contents, or NULL. The length
|
||||
* of the header, up to the first newline, is returned via out_len.
|
||||
*
|
||||
* 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_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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue