X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbyte.c;h=c9f35401063703ce627d49ea883e0548fe8098b9;hp=6993422eaf29412cba2cc92b4534edfb0c7043b7;hb=5e53f9e5f65aa5b3af6f5af9d868403536534afb;hpb=59926571aaec3e38cec09d0d9fa34f4a4b887309 diff --git a/mbyte.c b/mbyte.c index 6993422..c9f3540 100644 --- a/mbyte.c +++ b/mbyte.c @@ -102,14 +102,14 @@ static size_t wcrtomb_iconv (char *s, wchar_t wc, iconv_t cd) ib = buf; ob = s; obl = MB_LEN_MAX; - r = iconv (cd, &ib, &ibl, &ob, &obl); + r = my_iconv(cd, &ib, &ibl, &ob, &obl); } else { ib = ""; ibl = 1; ob = buf; obl = sizeof (buf); - r = iconv (cd, &ib, &ibl, &ob, &obl); + r = my_iconv(cd, &ib, &ibl, &ob, &obl); } return ob - s; } @@ -168,7 +168,7 @@ size_t mbrtowc_iconv (wchar_t * pwc, const char *s, size_t n, ibl = 1; for (;;) { - r = iconv (cd, &ib, &ibl, &ob, &obl); + r = my_iconv(cd, &ib, &ibl, &ob, &obl); if (ob > bufo && (!k || ib > bufi + k)) { /* we have a character */ memset (ps, 0, sizeof (*ps));