From: Michael Haggerty <mhagger@alum.mit.edu>
To: George Papanikolaou <g3orge.app@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] builtin/apply.c: use iswspace() to detect line-ending-like chars
Date: Fri, 21 Mar 2014 12:14:02 +0100 [thread overview]
Message-ID: <532C1EFA.3000109@alum.mit.edu> (raw)
In-Reply-To: <1395344384-7975-1-git-send-email-g3orge.app@gmail.com>
On 03/20/2014 08:39 PM, George Papanikolaou wrote:
> Removing the bloat of checking for both '\r' and '\n' with the prettier
> iswspace() function which checks for other characters as well. (read: \f \t \v)
> ---
>
> This is one more try to clean up this fuzzy_matchlines() function as part of a
> microproject for GSOC. The rest more clarrified microprojects were taken.
> I'm obviously planning on applying.
>
> Thanks
>
> Signed-of-by: George 'papanikge' Papanikolaou <g3orge.app@gmail.com>
>
> builtin/apply.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index b0d0986..912a53a 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -295,9 +295,9 @@ static int fuzzy_matchlines(const char *s1, size_t n1,
> int result = 0;
>
> /* ignore line endings */
> - while ((*last1 == '\r') || (*last1 == '\n'))
> + while (iswspace(*last1))
> last1--;
> - while ((*last2 == '\r') || (*last2 == '\n'))
> + while (iswspace(*last2))
> last2--;
>
> /* skip leading whitespace */
>
In addition to Eric's comments...
What happens if the string consists *only* of whitespace?
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2014-03-21 11:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 19:39 [PATCH] builtin/apply.c: use iswspace() to detect line-ending-like chars George Papanikolaou
2014-03-21 2:48 ` Eric Sunshine
[not found] ` <CAByyCQBmCTfW0HBL04MMqwm+bDe4Rb6n+MfWdYUQ6M6yW_u=yw@mail.gmail.com>
2014-03-21 23:07 ` Eric Sunshine
[not found] ` <CAPig+cTct-42w5S=OUS_DQ2cD5X9nWa_eUVoFBGTT7nAEahi5g@mail.gmail.com>
2014-03-22 9:33 ` George Papanikolaou
2014-03-23 9:35 ` Eric Sunshine
2014-03-21 11:14 ` Michael Haggerty [this message]
2014-03-25 4:54 ` Junio C Hamano
2014-03-26 16:58 ` George Papanikolaou
2014-03-26 18:02 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=532C1EFA.3000109@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=g3orge.app@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).