From: Junio C Hamano <gitster@pobox•com>
To: Siddharth Goel <siddharth98391@gmail•com>
Cc: git@vger•kernel.org, sunshine@sunshineco•com
Subject: Re: [PATCH v3] skip_prefix: rewrite so that prefix is scanned once
Date: Mon, 03 Mar 2014 14:43:18 -0800 [thread overview]
Message-ID: <xmqq61nuoqd5.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqvbvvp0gj.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 03 Mar 2014 11:05:16 -0800")
Junio C Hamano <gitster@pobox•com> writes:
> Siddharth Goel <siddharth98391@gmail•com> writes:
>
>> Helped-by: Eric Sunshine <sunshine@sunshineco•com>
>> Signed-off-by: Siddharth Goel <siddharth98391@gmail•com>
>> ---
>> Added a space after colon in the subject as compared to previous
>> patch [PATCH v2].
>>
>> [PATCH v2]: http://thread.gmane.org/gmane.comp.version-control.git/243150
>
> Whenever you see "Change", "Rewrite", etc. in the subject of a patch
> that touches existing code, think twice. The subject line is a
> scarce real estate to be wasted on a noiseword that carries no real
> information, and we already know a patch that touches existing code
> changes or rewrites things.
>
> Subject: [PATCH v3] skip_prefix: scan prefix only once
>
> perhaps?
>
>> git-compat-util.h | 7 +++++--
>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/git-compat-util.h b/git-compat-util.h
>> index 614a5e9..550dce3 100644
>> --- a/git-compat-util.h
>> +++ b/git-compat-util.h
>> @@ -357,8 +357,11 @@ extern int suffixcmp(const char *str, const char *suffix);
>>
>> static inline const char *skip_prefix(const char *str, const char *prefix)
>> {
>> - size_t len = strlen(prefix);
>> - return strncmp(str, prefix, len) ? NULL : str + len;
>> + while (*prefix != '\0' && *str == *prefix) {
>> + str++;
>> + prefix++;
>> + }
>> + return (*prefix == '\0' ? str : NULL);
>
> Unlike another patch I saw the other day on the same topic, this
> checks *prefix twice for the last round, even though I think this
> one is probably slightly easier to read. I dunno.
That is, something like this instead. After looking at it again, I
do not think it is less readable than the above.
git-compat-util.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index cbd86c3..68ffaef 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -357,8 +357,14 @@ extern int suffixcmp(const char *str, const char *suffix);
static inline const char *skip_prefix(const char *str, const char *prefix)
{
- size_t len = strlen(prefix);
- return strncmp(str, prefix, len) ? NULL : str + len;
+ while (1) {
+ if (!*prefix)
+ return str;
+ if (*str != *prefix)
+ return NULL;
+ prefix++;
+ str++;
+ }
}
#if defined(NO_MMAP) || defined(USE_WIN32_MMAP)
next prev parent reply other threads:[~2014-03-03 22:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 3:13 [PATCH v3] skip_prefix: rewrite so that prefix is scanned once Siddharth Goel
2014-03-03 19:05 ` Junio C Hamano
2014-03-03 22:43 ` Junio C Hamano [this message]
2014-03-03 23:22 ` David Kastrup
2014-03-03 23:35 ` Junio C Hamano
2014-03-03 23:37 ` Duy Nguyen
2014-03-04 0:09 ` David Kastrup
2014-03-04 1:58 ` Duy Nguyen
2014-03-04 9:18 ` David Kastrup
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq61nuoqd5.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=siddharth98391@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox