diff options
author | John Cai <johncai86@gmail.com> | 2022-01-06 20:07:35 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-06 21:17:20 (GMT) |
commit | cfc5cf428bcc8ff31748bba97baee31f529a30ea (patch) | |
tree | 46198b3f3106a8bc3e631bb3da928341df7b259b /builtin/receive-pack.c | |
parent | 2ae0a9cb8298185a94e5998086f380a355dd8907 (diff) | |
download | git-cfc5cf428bcc8ff31748bba97baee31f529a30ea.zip git-cfc5cf428bcc8ff31748bba97baee31f529a30ea.tar.gz git-cfc5cf428bcc8ff31748bba97baee31f529a30ea.tar.bz2 |
receive-pack.c: consolidate find header logic
There are two functions that have very similar logic of finding a header
value. find_commit_header, and find_header. We can conslidate the logic
by introducing a new function find_header_mem, which is equivalent to
find_commit_header except it takes a len parameter that determines how
many bytes will be read. find_commit_header and find_header can then both
call find_header_mem.
This reduces duplicate logic, as the logic for finding header values
can now all live in one place.
Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/receive-pack.c')
-rw-r--r-- | builtin/receive-pack.c | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 4f92e6f..37f77b9 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -581,32 +581,19 @@ static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) return strbuf_detach(&buf, NULL); } -/* - * NEEDSWORK: reuse find_commit_header() from jk/commit-author-parsing - * after dropping "_commit" from its name and possibly moving it out - * of commit.c - */ static char *find_header(const char *msg, size_t len, const char *key, const char **next_line) { - int key_len = strlen(key); - const char *line = msg; - - while (line && line < msg + len) { - const char *eol = strchrnul(line, '\n'); - - if ((msg + len <= eol) || line == eol) - return NULL; - if (line + key_len < eol && - !memcmp(line, key, key_len) && line[key_len] == ' ') { - int offset = key_len + 1; - if (next_line) - *next_line = *eol ? eol + 1 : eol; - return xmemdupz(line + offset, (eol - line) - offset); - } - line = *eol ? eol + 1 : NULL; - } - return NULL; + size_t out_len; + const char *val = find_header_mem(msg, len, key, &out_len); + + if (!val) + return NULL; + + if (next_line) + *next_line = val + out_len + 1; + + return xmemdupz(val, out_len); } /* |