more include simplifications

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index 72e28f3..08a95c8 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -11,22 +11,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
 
@@ -313,7 +298,7 @@ static void draw_envelope (HEADER * msg, char *fcc)
 static int edit_address_list (int line, address_t ** addr)
 {
   char buf[HUGE_STRING] = "";   /* needs to be large for alias expansion */
-  const char *err = NULL;
+  char *err = NULL;
 
   mutt_addrlist_to_local (*addr);
   rfc822_write_address (buf, sizeof (buf), *addr, 0);
@@ -366,7 +351,7 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x)
 
   idx[x]->content->next = NULL;
   idx[x]->content->parts = NULL;
-  mutt_free_body (&(idx[x]->content));
+  body_list_wipe(&(idx[x]->content));
   p_delete(&idx[x]->tree);
   p_delete(&idx[x]);
   for (; x < *idxlen - 1; x++)
@@ -508,7 +493,8 @@ static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
  */
 int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                        char *fcc,       /* where to save a copy of the message */
-                       ssize_t fcclen, HEADER * cur)
+                       ssize_t fcclen,
+                       HEADER * cur __attribute__ ((unused)))
 {                               /* current message */
   char helpstr[SHORT_STRING];
   char buf[LONG_STRING];
@@ -700,7 +686,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       if ((op == OP_COMPOSE_EDIT_HEADERS ||
            (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
         const char *tag = NULL;
-        const char *err = NULL;
+        char *err = NULL;
 
         mutt_env_to_local (msg->env);
         mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
@@ -1259,7 +1245,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           idx[idxlen]->content->parts = NULL;
           if (idx[idxlen]->unowned)
             idx[idxlen]->content->unlink = 0;
-          mutt_free_body (&idx[idxlen]->content);
+          body_list_wipe(&idx[idxlen]->content);
           p_delete(&idx[idxlen]->tree);
           p_delete(&idx[idxlen]);
         }