simplifications

[apps/madmutt.git] / recvcmd.c

diff --git a/recvcmd.c b/recvcmd.c
index b403044..550ec9c 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -7,29 +7,21 @@
  * 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/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 <lib-mx/mx.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "state.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "rfc1524.h"
 #include "attach.h"
-#include "mx.h"
 #include "copy.h"
 #include "mutt_idna.h"
 
@@ -115,9 +107,7 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
 
 
 /**
- **
  ** The bounce function, from the attachment menu
- **
  **/
 
 void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
@@ -126,7 +116,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
   short i;
   char prompt[STRING];
   char buf[HUGE_STRING];
-  const char *err = NULL;
+  char *err = NULL;
   address_t *adr = NULL;
   int ret = 0;
   int p = 0;
@@ -211,10 +201,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
 
 
 /**
- **
  ** resend-message, from the attachment menu 
- **
- **
  **/
 
 void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
@@ -236,9 +223,7 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTAC
 \f
 
 /**
- **
  ** forward-message, from the attachment menu 
- **
  **/
 
 /* try to find a common parent message for the tagged attachments. */
@@ -640,10 +625,7 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr,
 
 
 /**
- ** 
  ** the various reply functions, from the attachment menu
- **
- **
  **/
 
 /* Create the envelope defaults for a reply.