X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc2047.c;h=1d42403713e6b6801f6c2f608a58491ee19815c1;hp=a2629a9e52f8c102f3d79b2f47c2870a6b1db253;hb=981e10e224fde4de5d40adcee1deda89df2715ca;hpb=07066d3ea19865d08c4a8fd98b5e87eeace810da

diff --git a/lib-mime/rfc2047.c b/lib-mime/rfc2047.c
index a2629a9..1d42403 100644
--- a/lib-mime/rfc2047.c
+++ b/lib-mime/rfc2047.c
@@ -69,9 +69,9 @@ convert_string(const char *from, const char *f, ssize_t flen,
 
     obl = 4 * flen + 1;
     ob = buf = p_new(char, obl);
-    n = mutt_iconv(cd, &f, &flen, &ob, &obl);
+    n = my_iconv(cd, &f, &flen, &ob, &obl);
 
-    if (n < 0 || mutt_iconv(cd, 0, 0, &ob, &obl) < 0) {
+    if (n < 0 || my_iconv(cd, 0, 0, &ob, &obl) < 0) {
         int e = errno;
         iconv_close(cd);
         errno = e;
@@ -266,14 +266,14 @@ static size_t try_block(const char *d, ssize_t dlen,
 
         ob = buf1;
 
-        if (mutt_iconv(cd, &ib, &ibl, &ob, &obl) < 0
-        ||  mutt_iconv(cd, 0, 0, &ob, &obl) < 0)
+        if (my_iconv(cd, &ib, &ibl, &ob, &obl) < 0
+        ||  my_iconv(cd, 0, 0, &ob, &obl) < 0)
         {
             assert (errno == E2BIG && ib > d);
             iconv_close(cd);
             return (ib - d == dlen) ? dlen : ib - d + 1;
         }
-        iconv_close(cd);
+        iconv_close (cd);
     } else {
         if (dlen > obl)
             return obl + 1;
@@ -331,10 +331,10 @@ encode_block(char *s, char *d, ssize_t dlen,
         cd = mutt_iconv_open(tocode, fromcode, 0);
         assert (cd != MUTT_ICONV_ERROR);
         ib = d, ibl = dlen, ob = buf1, obl = sizeof(buf1) - m_strlen(tocode);
-        n1 = mutt_iconv(cd, &ib, &ibl, &ob, &obl);
-        n2 = mutt_iconv(cd, 0, 0, &ob, &obl);
+        n1 = my_iconv(cd, &ib, &ibl, &ob, &obl);
+        n2 = my_iconv(cd, 0, 0, &ob, &obl);
         assert (n1 >= 0 && n2 >= 0);
-        iconv_close(cd);
+        iconv_close (cd);
         return (*encoder)(s, buf1, ob - buf1, tocode);
     } else {
         return (*encoder)(s, d, dlen, tocode);