mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

(convert_from_8bit_to_utf_c2): use convert_from_8bit_to_utf_c().

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-01-21 12:00:34 +03:00
parent 9b74ff8653
commit d70a899c16
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/charsets.c
View File

@ -523,37 +523,16 @@ convert_from_8bit_to_utf_c (char input_char, GIConv conv)
int int
convert_from_8bit_to_utf_c2 (char input_char) convert_from_8bit_to_utf_c2 (char input_char)
{ {
unsigned char str[2];
int ch = '.'; int ch = '.';
GIConv conv; GIConv conv;
const char *cp_from; const char *cp_from;
str[0] = (unsigned char) input_char;
str[1] = '\0';
cp_from = get_codepage_id (mc_global.source_codepage); cp_from = get_codepage_id (mc_global.source_codepage);
conv = str_crt_conv_to (cp_from);
conv = str_crt_conv_to (cp_from);
if (conv != INVALID_CONV) if (conv != INVALID_CONV)
{ {
unsigned char buf_ch[UTF8_CHAR_LEN + 1]; ch = convert_from_8bit_to_utf_c (input_char, conv);
switch (str_translate_char (conv, (char *) str, -1, (char *) buf_ch, sizeof (buf_ch)))
{
case ESTR_SUCCESS:
{
int res;
res = g_utf8_get_char_validated ((char *) buf_ch, -1);
ch = res >= 0 ? res : buf_ch[0];
break;
}
case ESTR_PROBLEM:
case ESTR_FAILURE:
default:
ch = '.';
break;
}
str_close_conv (conv); str_close_conv (conv);
} }