mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-22 03:02:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

replace iconv* to g_iconv*, drop iconv.h

Browse Source
This commit is contained in:
Ilia Maslakov 2009-04-28 10:03:02 +00:00
parent 52a2f5379e
commit 6fd08cc199
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/charsets.c
View File

@ -25,8 +25,6 @@
#include <stdlib.h>
#include <string.h>
#include <iconv.h>
#include "global.h"
#include "charsets.h"
#include "strutil.h" /* utf-8 functions */
@ -148,21 +146,21 @@ get_codepage_index (const char *id)
}
static char
translate_character (iconv_t cd, char c)
translate_character (GIConv cd, char c)
{
char outbuf[4], *obuf;
size_t ibuflen, obuflen, count;
gchar *tmp_buff = NULL;
gsize bytes_read, bytes_written = 0;
const char *ibuf = &c;
char ch = UNKNCHAR;
ICONV_CONST char *ibuf = &c;
obuf = outbuf;
ibuflen = 1;
obuflen = 4;
int ibuflen = 1;
int obuflen = 4;
count = iconv (cd, &ibuf, &ibuflen, &obuf, &obuflen);
if (count != ((size_t) -1) && ibuflen == 0)
return outbuf[0];
return UNKNCHAR;
tmp_buff = g_convert_with_iconv (ibuf, ibuflen, cd, &bytes_read, &bytes_written, NULL);
if ( tmp_buff )
ch = tmp_buff[0];
g_free (tmp_buff);
return ch;
}
char errbuf[255];
@ -177,7 +175,7 @@ const char *
init_translation_table (int cpsource, int cpdisplay)
{
int i;
iconv_t cd;
GIConv cd;
/* Fill inpit <-> display tables */
@ -199,8 +197,8 @@ init_translation_table (int cpsource, int cpdisplay)
/* display <- inpit table */
cd = iconv_open (cp_display, cp_source);
if (cd == (iconv_t) - 1) {
cd = g_iconv_open (cp_display, cp_source);
if (cd == INVALID_CONV) {
g_snprintf (errbuf, sizeof (errbuf),
_("Cannot translate from %s to %s"), cp_source, cp_display);
return errbuf;
@ -209,12 +207,12 @@ init_translation_table (int cpsource, int cpdisplay)
for (i = 128; i <= 255; ++i)
conv_displ[i] = translate_character (cd, i);
iconv_close (cd);
g_iconv_close (cd);
/* inpit <- display table */
cd = iconv_open (cp_source, cp_display);
if (cd == (iconv_t) - 1) {
cd = g_iconv_open (cp_source, cp_display);
if (cd == INVALID_CONV) {
g_snprintf (errbuf, sizeof (errbuf),
_("Cannot translate from %s to %s"), cp_display, cp_source);
return errbuf;
@ -226,7 +224,7 @@ init_translation_table (int cpsource, int cpdisplay)
conv_input[i] = (ch == UNKNCHAR) ? i : ch;
}
iconv_close (cd);
g_iconv_close (cd);
return NULL;
}

2
src/strutil8bit.c
View File

@ -26,8 +26,6 @@
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
#include <iconv.h>
#include "global.h"
#include "strutil.h"

2
src/strutilascii.c
View File

@ -27,8 +27,6 @@
#include <ctype.h>
#include <config.h>
#include <errno.h>
#include <iconv.h>
#include "global.h"
#include "strutil.h"

1
src/strutilutf8.c
View File

@ -26,7 +26,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <iconv.h>
#include <glib.h>
#include <langinfo.h>
#include <string.h>