add m_strchrnul that does what GNU strchrnul does: search for 'c' or

[apps/madmutt.git] / recvcmd.c

diff --git a/recvcmd.c b/recvcmd.c
index 3ea0363..f504547 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -19,13 +19,14 @@
 
 #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 "state.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
 #include "rfc1524.h"
 #include "attach.h"
 #include "mx.h"
@@ -119,13 +120,13 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
  **
  **/
 
-void mutt_attach_bounce (FILE * fp, HEADER * hdr,
+void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
                          ATTACHPTR ** idx, short idxlen, BODY * cur)
 {
   short i;
   char prompt[STRING];
   char buf[HUGE_STRING];
-  char *err = NULL;
+  const char *err = NULL;
   address_t *adr = NULL;
   int ret = 0;
   int p = 0;
@@ -216,7 +217,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
  **
  **/
 
-void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
+void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
                          short idxlen, BODY * cur)
 {
   short i;
@@ -522,7 +523,7 @@ bail:
  * the attachment index. 
  */
 
-static void attach_forward_msgs (FILE * fp, HEADER * hdr,
+static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)),
                                  ATTACHPTR ** idx, short idxlen, BODY * cur,
                                  int flags)
 {
@@ -738,7 +739,7 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
 /*  This is _very_ similar to send.c's include_reply(). */
 
 static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
-                                  int flags)
+                                  int flags __attribute__ ((unused)))
 {
   int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV;
   int chflags = CH_DECODE;