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

Merge branch 'rs/skip-iprefix'

Browse Source 
Code simplification.

* rs/skip-iprefix:
  convert: use skip_iprefix() in validate_encoding()
  utf8: use skip_iprefix() in same_utf_encoding()
This commit is contained in:
Junio C Hamano 2019-12-01 09:04:36 -08:00
commit d2489ce92c
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
convert.c
View File

@ -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 {

9
utf8.c
View File

@ -411,11 +411,10 @@ out:
*/ */
static int same_utf_encoding(const char *src, const char *dst) static int same_utf_encoding(const char *src, const char *dst)
{ {
if (istarts_with(src, "utf") && istarts_with(dst, "utf")) { if (skip_iprefix(src, "utf", &src) && skip_iprefix(dst, "utf", &dst)) {
/* src[3] or dst[3] might be '\0' */ skip_prefix(src, "-", &src);
int i = (src[3] == '-' ? 4 : 3); skip_prefix(dst, "-", &dst);
int j = (dst[3] == '-' ? 4 : 3); return !strcasecmp(src, dst);
return !strcasecmp(src+i, dst+j);
} }
return 0; return 0;
} }