Re: [PATCH v4] commit.c: use skip_prefix() instead of starts_with()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 4, 2014, 21:23 UTC
- Message-ID
- <xmqqzjl5iro0.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1393967190-3181-1-git-send-email-tanayabh@gmail.com>
Tanay Abhra <tanayabh@gmail.com> writes:
Show 12 quoted lines
> 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 <max@quendi.de> > Helped-by: Junio C Hamano <gitster@pobox.com> > Helped-by: Michael Haggerty <mhagger@alum.mit.edu> > Signed-off-by: Tanay Abhra <tanayabh@gmail.com> > Signed-off-by: Junio C Hamano <gitster@pobox.com>
Do not add the last when sending; I never signed-off this particular version of this patch.
Show 28 quoted lines
> diff --git a/commit.c b/commit.c
> index 6bf4fe0..01526f7 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,14 @@ 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;
> }
> if (split_ident_line(&ident,
> - buf + strlen("author "),
> - line_end - (buf + strlen("author "))) ||
> + ident_line, line_end - ident_line) ||Funny indentation with some SP followed by HT followed by SP.
Show 16 quoted lines
> !ident.date_begin || !ident.date_end)
> goto fail_exit; /* malformed "author" line */
> break;
> @@ -1193,10 +1193,8 @@ 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);
> + if(!found) {
> found = strstr(buf, sigcheck_gpg_status[i].check);
> if (!found)
> continue;