Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
This commit is contained in:
Luis de Bethencourt 2016-08-14 17:48:47 +01:00
Родитель 4c7df64559
Коммит 1ca7087e59
1 изменённых файлов: 6 добавлений и 8 удалений

Просмотреть файл

@ -491,13 +491,10 @@ fail:
} }
/* /*
* UTF-8 to NLS charset convert routine * UTF-8 to NLS charset convert routine
* *
* * Uses uni2char() / char2uni() rather than the nls tables directly
* Changed 8/10/01 by Will Dyson. Now use uni2char() / char2uni() rather than
* the nls tables directly
*/ */
static int static int
befs_utf2nls(struct super_block *sb, const char *in, befs_utf2nls(struct super_block *sb, const char *in,
int in_len, char **out, int *out_len) int in_len, char **out, int *out_len)
@ -585,8 +582,9 @@ befs_nls2utf(struct super_block *sb, const char *in,
wchar_t uni; wchar_t uni;
int unilen, utflen; int unilen, utflen;
char *result; char *result;
/* There're nls characters that will translate to 3-chars-wide UTF-8 /*
* characters, a additional byte is needed to save the final \0 * There are nls characters that will translate to 3-chars-wide UTF-8
* characters, an additional byte is needed to save the final \0
* in special cases */ * in special cases */
int maxlen = (3 * in_len) + 1; int maxlen = (3 * in_len) + 1;
@ -625,7 +623,7 @@ befs_nls2utf(struct super_block *sb, const char *in,
return i; return i;
conv_err: conv_err:
befs_error(sb, "Name using charecter set %s contains a charecter that " befs_error(sb, "Name using character set %s contains a character that "
"cannot be converted to unicode.", nls->charset); "cannot be converted to unicode.", nls->charset);
befs_debug(sb, "<--- %s", __func__); befs_debug(sb, "<--- %s", __func__);
kfree(result); kfree(result);