From: Jeff King <peff@peff.net>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git Mailing List <git@vger.kernel.org>,
Lars Schneider <larsxschneider@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] convert: use skip_iprefix() in validate_encoding()
Date: Fri, 8 Nov 2019 17:19:49 -0500 [thread overview]
Message-ID: <20191108221949.GA18519@sigill.intra.peff.net> (raw)
In-Reply-To: <a61b60e4-77f4-10a9-65ff-f78348d4c4b7@web.de>
On Fri, Nov 08, 2019 at 09:27:34PM +0100, René Scharfe wrote:
> @@ -285,15 +289,10 @@ static int validate_encoding(const char *path, const char *enc,
> */
> const char *advise_msg = _(
> "The file '%s' contains a byte order "
> - "mark (BOM). Please use UTF-%s as "
> + "mark (BOM). Please use UTF-%.*s as "
> "working-tree-encoding.");
> - const char *stripped = NULL;
> - char *upper = xstrdup_toupper(enc);
> - upper[strlen(upper)-2] = '\0';
> - if (skip_prefix(upper, "UTF", &stripped))
> - skip_prefix(stripped, "-", &stripped);
> - advise(advise_msg, path, stripped);
> - free(upper);
> + int stripped_len = strlen(stripped) - strlen("BE");
> + advise(advise_msg, path, stripped_len, stripped);
I think we could drop xstrdup_toupper() after this.
Of course it _could_ come in handy in another spot, but in most cases
you can use xstrdup_tolower() interchangeably (e.g., that would have
worked here). And even the tolower() variant is seldom used.
-Peff
prev parent reply other threads:[~2019-11-08 22:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 20:27 [PATCH] convert: use skip_iprefix() in validate_encoding() René Scharfe
2019-11-08 22:19 ` Jeff King [this message]
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=20191108221949.GA18519@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=larsxschneider@gmail.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.
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).