X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=e7ca176535e862b3782382d3bcf68753fd48454b;hp=fc8037279ca493f87a6e6c6fa38fb360f5f17def;hb=b63368f0655c887d6a080faffdc462c0407f03f1;hpb=49081299c673ceebc38d9a4f0985608cb3aecfce

diff --git a/handler.c b/handler.c
index fc80372..e7ca176 100644
--- a/handler.c
+++ b/handler.c
@@ -25,13 +25,13 @@
 #include <lib-lib/file.h>
 
 #include <lib-mime/mime.h>
+#include <lib-mime/rfc3676.h>
 
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
-#include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
 #include "charset.h"
@@ -270,7 +270,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
     else
       bufi[l++] = ch;
 
-    if (l + 8 >= sizeof (bufi))
+    if (l + 8 >= ssizeof (bufi))
       mutt_convert_to_state (cd, bufi, &l, s);
   }
 
@@ -1259,7 +1259,7 @@ static int external_body_handler (BODY * b, STATE * s)
 void mutt_decode_attachment (BODY * b, STATE * s)
 {
   int istext = mutt_is_text_part (b);
-  iconv_t cd = (iconv_t) (-1);
+  iconv_t cd = MUTT_ICONV_ERROR;
 
   Quotebuf[0] = '\0';
 
@@ -1268,7 +1268,7 @@ void mutt_decode_attachment (BODY * b, STATE * s)
       const char *charset = mutt_get_parameter ("charset", b->parameter);
 
       if (!option (OPTSTRICTMIME) && !charset)
-        charset = mutt_get_first_charset (AssumedCharset);
+        charset = charset_getfirst(AssumedCharset);
       if (charset && Charset)
         cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
     }
@@ -1298,7 +1298,7 @@ void mutt_decode_attachment (BODY * b, STATE * s)
     break;
   }
 
-  if (cd != (iconv_t) (-1))
+  if (cd != MUTT_ICONV_ERROR)
     iconv_close (cd);
 }