From: "John Cai via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: John Cai <johncai86@gmail.com>, John Cai <johncai86@gmail.com>
Subject: [PATCH 1/2] receive-pack.c: consolidate find header logic
Date: Mon, 27 Dec 2021 18:26:37 +0000 [thread overview]
Message-ID: <9465c20d4bd398dacbd7df2c068513c9ec484dd8.1640629598.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1125.git.git.1640629598.gitgitgadget@gmail.com>
From: John Cai <johncai86@gmail.com>
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 using find_commit_header and replacing the logic in find_header.
This helps clean up the code, as the logic for finding header values can
stay in one place.
Signed-off-by: John Cai <johncai86@gmail.com>
---
builtin/receive-pack.c | 48 ++++++++++++++++++------------------------
commit.c | 3 ++-
2 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 4f92e6f059d..939d4b28b7c 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -581,32 +581,26 @@ 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)
+static char *find_header_value(const char *msg, 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;
+ size_t out_len;
+ const char *eol;
+ char *ret;
+
+ const char *val = find_commit_header(msg, key, &out_len);
+ if (val == NULL)
+ return NULL;
+
+ eol = strchrnul(val, '\n');
+ if (next_line) {
+ *next_line = *eol ? eol + 1: eol;
}
- return NULL;
+
+ ret = xmalloc(out_len+1);
+ memcpy(ret, val, out_len);
+ ret[out_len] = '\0';
+
+ return ret;
}
/*
@@ -625,7 +619,8 @@ static int constant_memequal(const char *a, const char *b, size_t n)
static const char *check_nonce(const char *buf, size_t len)
{
- char *nonce = find_header(buf, len, "nonce", NULL);
+ char *nonce = find_header_value(buf, "nonce", NULL);
+
timestamp_t stamp, ostamp;
char *bohmac, *expect = NULL;
const char *retval = NONCE_BAD;
@@ -730,8 +725,7 @@ static int check_cert_push_options(const struct string_list *push_options)
if (!len)
return 1;
- while ((option = find_header(buf, len, "push-option", &next_line))) {
- len -= (next_line - buf);
+ while ((option = find_header_value(buf, "push-option", &next_line))) {
buf = next_line;
options_seen++;
if (options_seen > push_options->nr
diff --git a/commit.c b/commit.c
index a348f085b2b..616a6780703 100644
--- a/commit.c
+++ b/commit.c
@@ -1645,7 +1645,8 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len
if (eol - line > key_len &&
!strncmp(line, key, key_len) &&
line[key_len] == ' ') {
- *out_len = eol - line - key_len - 1;
+ if (out_len != NULL)
+ *out_len = eol - line - key_len - 1;
return line + key_len + 1;
}
line = *eol ? eol + 1 : NULL;
--
gitgitgadget
next prev parent reply other threads:[~2021-12-27 18:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 18:26 [PATCH 0/2] Consolidate find_header logic into one function John Cai via GitGitGadget
2021-12-27 18:26 ` John Cai via GitGitGadget [this message]
2021-12-27 22:33 ` [PATCH 1/2] receive-pack.c: consolidate find header logic Junio C Hamano
2021-12-27 18:26 ` [PATCH 2/2] commit.c: rename find_commit_header to find_header John Cai via GitGitGadget
2021-12-29 6:19 ` [PATCH v2] receive-pack.c: consolidate find header logic John Cai via GitGitGadget
2021-12-30 23:01 ` Junio C Hamano
2021-12-31 6:17 ` [PATCH v3] " John Cai via GitGitGadget
2022-01-04 1:56 ` Junio C Hamano
2022-01-04 15:12 ` John Cai
2022-01-05 15:21 ` [PATCH v4] " John Cai via GitGitGadget
2022-01-05 20:10 ` Junio C Hamano
2022-01-06 0:51 ` [PATCH v5] " John Cai via GitGitGadget
2022-01-06 19:40 ` Junio C Hamano
2022-01-06 20:07 ` [PATCH v6] " John Cai via GitGitGadget
2022-01-08 4:54 ` John Cai
2022-01-08 7:11 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9465c20d4bd398dacbd7df2c068513c9ec484dd8.1640629598.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johncai86@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).