X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=5e5faf05c98ef87092dc359036e3176e097be56c;hp=1f15e17d28a8057efc56ca1ea3a1ddaad50dfd12;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=d8c2844a5a8b0fcf09158dcdd452f6e43e29b5db diff --git a/sendlib.c b/sendlib.c index 1f15e17..5e5faf0 100644 --- a/sendlib.c +++ b/sendlib.c @@ -566,7 +566,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, /* Convert to UTF-8 */ ib = bufi; ob = bufu, obl = sizeof (bufu); - n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl); + n = mutt_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl); if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) { ret = -1; break; @@ -578,7 +578,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, if (cd[i] != MUTT_ICONV_ERROR && score[i] != -1) { ub = bufu, ubl = ubl1; ob = bufo, obl = sizeof (bufo); - n = my_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl); + n = mutt_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl); if (n == -1) { score[i] = -1; } @@ -627,9 +627,9 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, for (i = 0; i < ncodes; i++) if (cd[i] != MUTT_ICONV_ERROR) - iconv_close (cd[i]); + iconv_close(cd[i]); - iconv_close (cd1); + iconv_close(cd1); p_delete(&cd); p_delete(&infos); p_delete(&score);