From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Jeff King <peff@peff.net>
Cc: "René Scharfe" <l.s.r@web.de>, "Git List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH] wt-status: use strncmp() for length-limited string comparison
Date: Wed, 25 Nov 2015 11:29:39 +0100 [thread overview]
Message-ID: <vpqtwoawewc.fsf@anie.imag.fr> (raw)
In-Reply-To: <20151125091503.GA1779@sigill.intra.peff.net> (Jeff King's message of "Wed, 25 Nov 2015 04:15:03 -0500")
Jeff King <peff@peff.net> writes:
>> diff --git a/wt-status.c b/wt-status.c
>> index 435fc28..96a731e 100644
>> --- a/wt-status.c
>> +++ b/wt-status.c
>> @@ -1317,14 +1317,14 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
>> target += strlen(" to ");
>> strbuf_reset(&cb->buf);
>> hashcpy(cb->nsha1, nsha1);
>> - for (end = target; *end && *end != '\n'; end++)
>> - ;
>> - if (!memcmp(target, "HEAD", end - target)) {
>> + if (skip_prefix(target, "HEAD", &end) && (!*end || *end == '\n')) {
>> /* HEAD is relative. Resolve it to the right reflog entry. */
>> strbuf_addstr(&cb->buf,
>> find_unique_abbrev(nsha1, DEFAULT_ABBREV));
>> return 1;
>> }
>
> Yeah, I think parsing left-to-right like this makes things much more
> obvious.
Agreed.
>> + for (end = target; *end && *end != '\n'; end++)
>> + ;
>
> This loop (which I know you just moved, not wrote) is basically
> strchrnul, isn't it? That might be more readable.
Agreed too.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-11-25 10:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-06 22:47 [PATCH] wt-status: use strncmp() for length-limited string comparison René Scharfe
2015-11-24 21:36 ` Jeff King
2015-11-25 2:16 ` René Scharfe
2015-11-25 9:15 ` Jeff King
2015-11-25 10:29 ` Matthieu Moy [this message]
2015-11-25 14:10 ` [PATCH v2] wt-status: correct and simplify check for detached HEAD René Scharfe
2015-11-25 16:21 ` Matthieu Moy
2015-11-28 17:31 ` Jeff King
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=vpqtwoawewc.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
/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).