move more things in the lib-mime

[apps/madmutt.git] / lib-mime / rfc2047.c

diff --git a/lib-mime/rfc2047.c b/lib-mime/rfc2047.c
index 7162b47..71bf5c7 100644 (file)
--- a/lib-mime/rfc2047.c
+++ b/lib-mime/rfc2047.c
@@ -73,7 +73,7 @@ convert_string(const char *from, const char *f, ssize_t flen,
 
     cd = mutt_iconv_open(to, from, 0);
 
 
     cd = mutt_iconv_open(to, from, 0);
 

-    if (cd == (iconv_t)(-1))
+    if (cd == MUTT_ICONV_ERROR)

         return -1;
 
     obl = 4 * flen + 1;
         return -1;
 
     obl = 4 * flen + 1;


@@ -271,7 +271,7 @@ static size_t try_block(const char *d, ssize_t dlen,
         ssize_t ibl = dlen;
         iconv_t cd = mutt_iconv_open(tocode, fromcode, 0);
 
         ssize_t ibl = dlen;
         iconv_t cd = mutt_iconv_open(tocode, fromcode, 0);
 

-        assert (cd != (iconv_t)(-1));
+        assert (cd != MUTT_ICONV_ERROR);

 
         ob = buf1;
 
 
         ob = buf1;
 


@@ -338,7 +338,7 @@ encode_block(char *s, char *d, ssize_t dlen,
 
     if (fromcode) {
         cd = mutt_iconv_open(tocode, fromcode, 0);
 
     if (fromcode) {
         cd = mutt_iconv_open(tocode, fromcode, 0);

-        assert (cd != (iconv_t) (-1));
+        assert (cd != MUTT_ICONV_ERROR);

         ib = d, ibl = dlen, ob = buf1, obl = sizeof(buf1) - m_strlen(tocode);
         n1 = my_iconv(cd, &ib, &ibl, &ob, &obl);
         n2 = my_iconv(cd, 0, 0, &ob, &obl);
         ib = d, ibl = dlen, ob = buf1, obl = sizeof(buf1) - m_strlen(tocode);
         n1 = my_iconv(cd, &ib, &ibl, &ob, &obl);
         n2 = my_iconv(cd, 0, 0, &ob, &obl);