Use MU_ARG_UNUSED to mark unused formal parameters.

15 files changed, 27 insertions, 26 deletions

diff --git a/mail/decode.c b/mail/decode.c
index 28680909d..7d114bbe2 100644
--- a/mail/decode.c
+++ b/mail/decode.c
@@ -73,7 +73,8 @@ display_message (mu_message_t mesg, msgset_t *msgset, void *arg)
 }
 
 static void
-display_headers (FILE *out, mu_message_t mesg, const msgset_t *msgset ARG_UNUSED,
+display_headers (FILE *out, mu_message_t mesg, 
+                 const msgset_t *msgset MU_ARG_UNUSED,
 		 int select_hdr)
 {
   mu_header_t hdr = NULL;
diff --git a/mail/escape.c b/mail/escape.c
index d886a3f9e..8675ec847 100644
--- a/mail/escape.c
+++ b/mail/escape.c
@@ -215,7 +215,7 @@ escape_command (int argc, char **argv, compose_env_t *env)
 
 /* ~? */
 int
-escape_help (int argc, char **argv, compose_env_t *env ARG_UNUSED)
+escape_help (int argc, char **argv, compose_env_t *env MU_ARG_UNUSED)
 {
   int status;
   if (argc < 2)
@@ -230,7 +230,7 @@ escape_help (int argc, char **argv, compose_env_t *env ARG_UNUSED)
 /* ~A */
 /* ~a */
 int
-escape_sign (int argc ARG_UNUSED, char **argv, compose_env_t *env ARG_UNUSED)
+escape_sign (int argc MU_ARG_UNUSED, char **argv, compose_env_t *env MU_ARG_UNUSED)
 {
   char *p;
 
@@ -286,8 +286,8 @@ escape_cc (int argc, char **argv, compose_env_t *env)
 
 /* ~d */
 int
-escape_deadletter (int argc ARG_UNUSED, char **argv ARG_UNUSED,
-		   compose_env_t *env ARG_UNUSED)
+escape_deadletter (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED,
+		   compose_env_t *env MU_ARG_UNUSED)
 {
   FILE *dead = fopen (getenv ("DEAD"), "r");
   int c;
@@ -379,7 +379,7 @@ escape_visual (int argc, char **argv, compose_env_t *env)
 /* ~f[mesg-list] */
 /* ~F[mesg-list] */
 int
-escape_print (int argc, char **argv, compose_env_t *env ARG_UNUSED)
+escape_print (int argc, char **argv, compose_env_t *env MU_ARG_UNUSED)
 {
   return mail_print (argc, argv);
 }
@@ -408,7 +408,7 @@ escape_headers (int argc, char **argv, compose_env_t *env)
 
 /* ~i[var-name] */
 int
-escape_insert (int argc, char **argv, compose_env_t *send_env ARG_UNUSED)
+escape_insert (int argc, char **argv, compose_env_t *send_env MU_ARG_UNUSED)
 {
   struct mail_env_entry *env;
 
@@ -533,7 +533,7 @@ escape_type_input (int argc, char **argv, compose_env_t *env)
 
 /* ~r[filename] */
 int
-escape_read (int argc, char **argv, compose_env_t *env ARG_UNUSED)
+escape_read (int argc, char **argv, compose_env_t *env MU_ARG_UNUSED)
 {
   char *filename;
   FILE *inf;
diff --git a/mail/exit.c b/mail/exit.c
index 6781cf414..0e680b602 100644
--- a/mail/exit.c
+++ b/mail/exit.c
@@ -19,7 +19,7 @@
 #include "mail.h"
 
 int
-mail_exit (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_exit (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   mu_mailbox_close (mbox);
   exit (0);
diff --git a/mail/folders.c b/mail/folders.c
index ae5433845..379bbfecd 100644
--- a/mail/folders.c
+++ b/mail/folders.c
@@ -23,7 +23,7 @@
  */
 
 int
-mail_folders (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_folders (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   char *path;
 
diff --git a/mail/if.c b/mail/if.c
index 198295396..bd7460711 100644
--- a/mail/if.c
+++ b/mail/if.c
@@ -127,7 +127,7 @@ mail_if (int argc, char **argv)
 
 
 int
-mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_else (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   int cond;
 
@@ -145,7 +145,7 @@ mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 }
 
 int
-mail_endif (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_endif (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   if (_cond_level == 0)
     {
diff --git a/mail/inc.c b/mail/inc.c
index 1f5971255..13a9b9014 100644
--- a/mail/inc.c
+++ b/mail/inc.c
@@ -23,7 +23,7 @@
  */
 
 int
-mail_inc (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_inc (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   if (!mu_mailbox_is_updated (mbox))
     {
diff --git a/mail/list.c b/mail/list.c
index fa651ba6d..21395dd82 100644
--- a/mail/list.c
+++ b/mail/list.c
@@ -24,7 +24,7 @@
  */
 
 int
-mail_list (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_list (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   mail_command_list ();
   return 0;
diff --git a/mail/mail.c b/mail/mail.c
index a754fa582..b7466d266 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -185,7 +185,7 @@ static const char *mail_capa[] = {
 };
 			     
 static char *
-mail_cmdline (void *closure, int cont ARG_UNUSED)
+mail_cmdline (void *closure, int cont MU_ARG_UNUSED)
 {
   char *prompt = (char*) closure;
   char *rc;
@@ -543,7 +543,7 @@ mail_mainloop (char *(*input) (void *, int),
 }
 
 int
-mail_warranty (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_warranty (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   fputs (_("GNU Mailutils -- a suite of utilities for electronic mail\n"
            "Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,\n"
diff --git a/mail/mailline.c b/mail/mailline.c
index 29363b17e..03641b4b9 100644
--- a/mail/mailline.c
+++ b/mail/mailline.c
@@ -305,7 +305,7 @@ ml_attempted_completion_over ()
 
 /* Completion functions */
 char **
-no_compl (int argc ARG_UNUSED, char **argv ARG_UNUSED, int ws ARG_UNUSED)
+no_compl (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED, int ws MU_ARG_UNUSED)
 {
   ml_attempted_completion_over ();
   return NULL;
@@ -320,7 +320,7 @@ msglist_compl (int argc, char **argv, int ws)
 }
 
 char **
-msglist_file_compl (int argc, char **argv, int ws ARG_UNUSED)
+msglist_file_compl (int argc, char **argv, int ws MU_ARG_UNUSED)
 {
   if (argc == 1)
     ml_attempted_completion_over ();
@@ -989,7 +989,7 @@ readline (char *prompt)
 }
 
 void
-ml_set_completion_append_character (int c ARG_UNUSED)
+ml_set_completion_append_character (int c MU_ARG_UNUSED)
 {
 }
 
diff --git a/mail/msgset.y b/mail/msgset.y
index 3da89e81e..e9352936e 100644
--- a/mail/msgset.y
+++ b/mail/msgset.y
@@ -653,7 +653,7 @@ select_body (mu_message_t msg, void *closure)
 }
 
 int
-select_sender (mu_message_t msg ARG_UNUSED, void *closure ARG_UNUSED)
+select_sender (mu_message_t msg MU_ARG_UNUSED, void *closure MU_ARG_UNUSED)
 {
   /* char *sender = (char*) closure; */
   /* FIXME: all messages from sender argv[i] */
@@ -691,7 +691,7 @@ select_type (mu_message_t msg, void *closure)
 }
 
 int
-select_deleted (mu_message_t msg, void *closure ARG_UNUSED)
+select_deleted (mu_message_t msg, void *closure MU_ARG_UNUSED)
 {
   mu_attribute_t attr= NULL;
   int rc;
diff --git a/mail/quit.c b/mail/quit.c
index 63bf55dc7..38476db20 100644
--- a/mail/quit.c
+++ b/mail/quit.c
@@ -25,7 +25,7 @@
  */
 
 int
-mail_quit (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_quit (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   if (mail_mbox_close ())
     return 1;
diff --git a/mail/source.c b/mail/source.c
index 533b39ade..9abf2d73d 100644
--- a/mail/source.c
+++ b/mail/source.c
@@ -20,7 +20,7 @@
 
 
 static char *
-source_readline (void *closure, int cont ARG_UNUSED)
+source_readline (void *closure, int cont MU_ARG_UNUSED)
 {
   FILE *fp = closure;
   size_t s = 0;
diff --git a/mail/summary.c b/mail/summary.c
index 55890c3dc..ab0b73dae 100644
--- a/mail/summary.c
+++ b/mail/summary.c
@@ -23,7 +23,7 @@
    The side effect is that it sets the cursor
    to the newest or read message number.  */
 int
-mail_summary (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_summary (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   mu_message_t msg;
   mu_attribute_t attr;
diff --git a/mail/tag.c b/mail/tag.c
index a1f2bc578..cea14047f 100644
--- a/mail/tag.c
+++ b/mail/tag.c
@@ -23,7 +23,7 @@
 /* unt[ag] [msglist] */
 
 static int
-tag_message (mu_message_t mesg, msgset_t *msgset ARG_UNUSED, void *arg)
+tag_message (mu_message_t mesg, msgset_t *msgset MU_ARG_UNUSED, void *arg)
 {
   mu_attribute_t attr;
   int *action = arg;
diff --git a/mail/version.c b/mail/version.c
index 8dedc5653..ec4590975 100644
--- a/mail/version.c
+++ b/mail/version.c
@@ -38,7 +38,7 @@ static const char *with_defs[] =
 
 
 int
-mail_version (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+mail_version (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 { 
   fprintf (ofile, "%s", argp_program_version);
   if (with_defs[0] != NULL)