Re: [PATCH v3] commit.c: use skip_prefix() instead of starts_with()
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:00:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH v3] commit.c: use skip_prefix() instead of starts_with() · Max Horn <hidden>
- 2016-06-15 · Re: [PATCH v3] commit.c: use skip_prefix() instead of starts_with() · Junio C Hamano <hidden>
- 2016-06-15 · [PATCH v3] commit.c: use skip_prefix() instead of starts_with() · Tanay Abhra <hidden>
Tanay Abhra [off-list ref] writes:
In record_author_date() & parse_gpg_output() ,using skip_prefix() instead of starts_with() is a more suitable abstraction.
Thanks. Will queue with a reworded message to clarify what exactly "A more suitable" means. Here is what I tentatively came up with. -- >8 -- From: Tanay Abhra <redacted> Date: Tue, 4 Mar 2014 00:42:20 -0800 Subject: [PATCH] commit.c: use skip_prefix() instead of starts_with() In record_author_date() & parse_gpg_output(), the callers of starts_with() not just want to know if the string starts with the prefix, but also can benefit from knowing the string that follows the prefix. By using skip_prefix(), we can do both at the same time. Helped-by: Max Horn [off-list ref] Helped-by: Junio C Hamano [off-list ref] Helped-by: Michael Haggerty [off-list ref] Signed-off-by: Tanay Abhra <redacted> Signed-off-by: Junio C Hamano <redacted> --- commit.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/commit.c b/commit.c
index 6bf4fe0..6c92acb 100644
--- a/commit.c
+++ b/commit.c@@ -548,7 +548,7 @@ define_commit_slab(author_date_slab, unsigned long); static void record_author_date(struct author_date_slab *author_date, struct commit *commit) { - const char *buf, *line_end; + const char *buf, *line_end, *ident_line; char *buffer = NULL; struct ident_split ident; char *date_end;
@@ -566,14 +566,16 @@ static void record_author_date(struct author_date_slab *author_date, buf; buf = line_end + 1) { line_end = strchrnul(buf, '\n'); - if (!starts_with(buf, "author ")) { + ident_line = skip_prefix(buf, "author "); + if (!ident_line) { if (!line_end[0] || line_end[1] == '\n') return; /* end of header */ continue; } + buf = ident_line; if (split_ident_line(&ident, - buf + strlen("author "), - line_end - (buf + strlen("author "))) || + buf, + line_end - buf) || !ident.date_begin || !ident.date_end) goto fail_exit; /* malformed "author" line */ break;
@@ -1193,10 +1195,9 @@ static void parse_gpg_output(struct signature_check *sigc) for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) { const char *found, *next; - if (starts_with(buf, sigcheck_gpg_status[i].check + 1)) { - /* At the very beginning of the buffer */ - found = buf + strlen(sigcheck_gpg_status[i].check + 1); - } else { + found = skip_prefix(buf, sigcheck_gpg_status[i].check + 1); + /* At the very beginning of the buffer */ + if(!found) { found = strstr(buf, sigcheck_gpg_status[i].check); if (!found) continue;
--
1.9.0-186-gd464cb7