mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'rs/skip-iprefix'
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:
commit
d2489ce92c
22
convert.c
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,
|
||||
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-?? */
|
||||
if (istarts_with(enc, "UTF")) {
|
||||
if (skip_iprefix(enc, "UTF", &stripped)) {
|
||||
skip_prefix(stripped, "-", &stripped);
|
||||
|
||||
/*
|
||||
* 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 = _(
|
||||
"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);
|
||||
if (die_on_error)
|
||||
die(error_msg, path, enc);
|
||||
else {
|
||||
|
@ -308,12 +307,7 @@ static int validate_encoding(const char *path, const char *enc,
|
|||
"mark (BOM). Please use UTF-%sBE or UTF-%sLE "
|
||||
"(depending on the byte order) as "
|
||||
"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);
|
||||
free(upper);
|
||||
if (die_on_error)
|
||||
die(error_msg, path, enc);
|
||||
else {
|
||||
|
|
9
utf8.c
9
utf8.c
|
@ -411,11 +411,10 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,
|
|||
*/
|
||||
static int same_utf_encoding(const char *src, const char *dst)
|
||||
{
|
||||
if (istarts_with(src, "utf") && istarts_with(dst, "utf")) {
|
||||
/* src[3] or dst[3] might be '\0' */
|
||||
int i = (src[3] == '-' ? 4 : 3);
|
||||
int j = (dst[3] == '-' ? 4 : 3);
|
||||
return !strcasecmp(src+i, dst+j);
|
||||
if (skip_iprefix(src, "utf", &src) && skip_iprefix(dst, "utf", &dst)) {
|
||||
skip_prefix(src, "-", &src);
|
||||
skip_prefix(dst, "-", &dst);
|
||||
return !strcasecmp(src, dst);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue