more simplifications.

[apps/madmutt.git] / recvattach.c

diff --git a/recvattach.c b/recvattach.c
index bc59c76..07905f9 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -8,16 +8,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# 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>
 
@@ -34,14 +25,6 @@
 #include <lib-crypt/crypt.h>
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
 static char LastSaveFolder[_POSIX_PATH_MAX] = "";
 
@@ -952,7 +935,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);
         }
       }
@@ -1244,7 +1227,7 @@ void mutt_view_attachments (HEADER * hdr)
 
       if (need_secured && secured) {
         fclose (fp);
-        mutt_free_body (&cur);
+        body_list_wipe(&cur);
       }
 
       mutt_menuDestroy (&menu);