X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=c2fec5eb2a275383dc3e8f9b6cd882eac2ae729d;hp=d16a4297c6fbcef5a4dc48a85f6319d14b078796;hb=230399f9632c37b66c1c117a17e8327eae6b3235;hpb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982

diff --git a/recvattach.c b/recvattach.c
index d16a429..c2fec5e 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -12,23 +12,17 @@
 # include "config.h"
 #endif
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
-#include "enter.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
 #include "attach.h"
 #include "mx.h"
 #include "copy.h"
@@ -188,7 +182,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
  * %u = unlink 
  */
 const char *mutt_attach_fmt (char *dest,
-                             size_t destlen,
+                             ssize_t destlen,
                              char op,
                              const char *src,
                              const char *prefix,
@@ -201,7 +195,7 @@ const char *mutt_attach_fmt (char *dest,
   char charset[SHORT_STRING];
   ATTACHPTR *aptr = (ATTACHPTR *) data;
   int optional = (flags & M_FORMAT_OPTIONAL);
-  size_t l;
+  ssize_t l;
 
   switch (op) {
   case 'C':
@@ -953,7 +947,7 @@ void mutt_view_attachments (HEADER * hdr)
           cur = NULL;
           secured = !crypt_smime_decrypt_mime (_fp, &fp, _cur, &cur);
 
-          mutt_free_body (&_cur);
+          body_list_wipe(&_cur);
           safe_fclose (&_fp);
         }
       }
@@ -1245,7 +1239,7 @@ void mutt_view_attachments (HEADER * hdr)
 
       if (need_secured && secured) {
         fclose (fp);
-        mutt_free_body (&cur);
+        body_list_wipe(&cur);
       }
 
       mutt_menuDestroy (&menu);