kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/remove-unused-find-header-mem' 

Code clean-up.

* rs/remove-unused-find-header-mem:
  commit: remove find_header_mem()
maint
Junio C Hamano 2024-06-27 09:19:59 -07:00
parent b8d1a1b06c 28dc26dc33
commit 5dce36e04f
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
commit.c
View File

@ -1870,20 +1870,12 @@ struct commit_list **commit_list_append(struct commit *commit,
return &new_commit->next; return &new_commit->next;
} }


const char *find_header_mem(const char *msg, size_t len, const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
const char *key, size_t *out_len)
{ {
int key_len = strlen(key); int key_len = strlen(key);
const char *line = msg; const char *line = msg;


/* while (line) {
* 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) {
const char *eol = strchrnul(line, '\n'); const char *eol = strchrnul(line, '\n');


if (line == eol) if (line == eol)
@ -1900,10 +1892,6 @@ const char *find_header_mem(const char *msg, size_t len,
return NULL; 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 * 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 * order to find where to put a new Signed-off-by trailer. Ignored are

5
commit.h
View File

@ -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". * 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 * 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. * 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 * Note that some headers (like mergetag) may be multi-line. It is the caller's
* responsibility to parse further in this case! * 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, const char *find_commit_header(const char *msg, const char *key,
size_t *out_len); size_t *out_len);