undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert: use skip_iprefix() in validate_encoding()

Browse Source 
Use skip_iprefix() to parse "UTF" case-insensitively instead of checking
with istarts_with(), building an upper-case version and then using
skip_prefix() on it.  This gets rid of duplicate code and of a small
allocation.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2019-11-08 21:27:34 +01:00 committed by Junio C Hamano
parent 89f8cabaf3
commit ed28358833
1 changed files with 8 additions and 14 deletions

22
convert.c

@ -270,8 +270,12 @@ static int will_convert_lf_to_crlf(struct text_stat *stats,
static int validate_encoding(const char *path, const char *enc, static int validate_encoding(const char *path, const char *enc,
const char *data, size_t len, int die_on_error) const char *data, size_t len, int die_on_error)
{ {
const char *stripped;
/* We only check for UTF here as UTF?? can be an alias for UTF-?? */ /* We only check for UTF here as UTF?? can be an alias for UTF-?? */
if (istarts_with(enc, "UTF")) { if (skip_iprefix(enc, "UTF", &stripped)) {
skip_prefix(stripped, "-", &stripped);
/* /*
* Check for detectable errors in UTF encodings * Check for detectable errors in UTF encodings
*/ */
@ -285,15 +289,10 @@ static int validate_encoding(const char *path, const char *enc,
*/ */
const char *advise_msg = _( const char *advise_msg = _(
"The file '%s' contains a byte order " "The file '%s' contains a byte order "
"mark (BOM). Please use UTF-%s as " "mark (BOM). Please use UTF-%.*s as "
"working-tree-encoding."); "working-tree-encoding.");
const char *stripped = NULL; int stripped_len = strlen(stripped) - strlen("BE");
char *upper = xstrdup_toupper(enc); advise(advise_msg, path, stripped_len, stripped);
upper[strlen(upper)-2] = '\0';
if (skip_prefix(upper, "UTF", &stripped))
skip_prefix(stripped, "-", &stripped);
advise(advise_msg, path, stripped);
free(upper);
if (die_on_error) if (die_on_error)
die(error_msg, path, enc); die(error_msg, path, enc);
else { else {
@ -308,12 +307,7 @@ static int validate_encoding(const char *path, const char *enc,
"mark (BOM). Please use UTF-%sBE or UTF-%sLE " "mark (BOM). Please use UTF-%sBE or UTF-%sLE "
"(depending on the byte order) as " "(depending on the byte order) as "
"working-tree-encoding."); "working-tree-encoding.");
const char *stripped = NULL;
char *upper = xstrdup_toupper(enc);
if (skip_prefix(upper, "UTF", &stripped))
skip_prefix(stripped, "-", &stripped);
advise(advise_msg, path, stripped, stripped); advise(advise_msg, path, stripped, stripped);
free(upper);
if (die_on_error) if (die_on_error)
die(error_msg, path, enc); die(error_msg, path, enc);
else { else {