Use ARG_UNUSED where necessary

15 files changed, 27 insertions, 59 deletions

diff --git a/mail/decode.c b/mail/decode.c
index 12804e105..8ef23a470 100644
--- a/mail/decode.c
+++ b/mail/decode.c
@@ -84,12 +84,11 @@ display_message (message_t mesg, msgset_t *msgset, void *arg)
 }
 
 static void
-display_headers (FILE *out, message_t mesg, const msgset_t *msgset,
+display_headers (FILE *out, message_t mesg, const msgset_t *msgset ARG_UNUSED,
 		 int select_hdr)
 {
   header_t hdr = NULL;
 
-  (void)msgset;
   /* Print the selected headers only.  */
   if (select_hdr)
     {
@@ -269,8 +268,7 @@ get_content_encoding (header_t hdr, char **value)
 
 
 static int
-mailcap_lookup (const char *type)
+mailcap_lookup (const char *type ARG_UNUSED)
 {
-  (void)type;
   return 0;
 }
diff --git a/mail/exit.c b/mail/exit.c
index d68552d1b..9aa73e97f 100644
--- a/mail/exit.c
+++ b/mail/exit.c
@@ -18,9 +18,8 @@
 #include "mail.h"
 
 int
-mail_exit (int argc, char **argv)
+mail_exit (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
-  (void)argc; (void)argv;
   mailbox_close (mbox);
   exit (0);
 }
diff --git a/mail/folders.c b/mail/folders.c
index decea5729..7970cb43b 100644
--- a/mail/folders.c
+++ b/mail/folders.c
@@ -22,12 +22,10 @@
  */
 
 int
-mail_folders (int argc, char **argv)
+mail_folders (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
   char *path;
 
-  (void)argc; (void)argv;
-
   if (util_getenv (&path, "folder", Mail_env_string, 1))
     return 1;
 
diff --git a/mail/if.c b/mail/if.c
index ecb202a67..ec61a9c9c 100644
--- a/mail/if.c
+++ b/mail/if.c
@@ -125,10 +125,10 @@ mail_if (int argc, char **argv)
 
 
 int
-mail_else (int argc, char **argv)
+mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
   int cond;
-  (void)argc; (void)argv;
+
   if (_cond_level == 0)
     {
       util_error(_("else without matching if"));
@@ -142,9 +142,8 @@ mail_else (int argc, char **argv)
 }
 
 int
-mail_endif (int argc, char **argv)
+mail_endif (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
-  (void)argc; (void)argv;
   if (_cond_level == 0)
     {
       util_error(_("endif without matching if"));
diff --git a/mail/inc.c b/mail/inc.c
index 3f2e7f9a5..470438716 100644
--- a/mail/inc.c
+++ b/mail/inc.c
@@ -22,9 +22,8 @@
  */
 
 int
-mail_inc (int argc, char **argv)
+mail_inc (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
-  (void)argc; (void)argv;
   if (!mailbox_is_updated (mbox))
     {
       mailbox_messages_count (mbox, &total);
diff --git a/mail/list.c b/mail/list.c
index 7c97bfada..a5b4e4fdc 100644
--- a/mail/list.c
+++ b/mail/list.c
@@ -23,14 +23,12 @@
  */
 
 int
-mail_list (int argc, char **argv)
+mail_list (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
   const char *cmd = NULL;
   int i = 0, pos = 0, len = 0;
   int cols = util_getcols ();
 
-  (void)argc; (void)argv;
-
   for (i=0; mail_command_table[i].shortname != 0; i++)
     {
       len = strlen (mail_command_table[i].longname);
diff --git a/mail/mail.c b/mail/mail.c
index 4f664b9d0..40a18dc00 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -173,13 +173,11 @@ static const char *mail_capa[] = {
 };
 			     
 static char *
-mail_cmdline(void *closure, int cont)
+mail_cmdline(void *closure, int cont ARG_UNUSED)
 {
   char *prompt = (char*) closure;
   char *rc;
 
-  (void)cont;
-
   while (1)
     {
       if (util_getenv (NULL, "autoinc", Mail_env_boolean, 0) == 0
@@ -498,10 +496,8 @@ mail_mainloop (char *(*input) __P((void *, int)), void *closure, int do_history)
 }
 
 int
-mail_warranty (int argc, char **argv)
+mail_warranty (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
-  (void)argc; (void)argv;
-
   fputs (_("GNU Mailutils -- a suite of utilities for electronic mail\n"
            "Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.\n\n"),
            ofile);
diff --git a/mail/mailline.c b/mail/mailline.c
index 55e25276e..6fda94cc1 100644
--- a/mail/mailline.c
+++ b/mail/mailline.c
@@ -216,9 +216,8 @@ ml_reread (const char *prompt, char **text)
  * readline tab completion
  */
 char **
-ml_command_completion (char *cmd, int start, int end)
+ml_command_completion (char *cmd, int start ARG_UNUSED, int end ARG_UNUSED)
 {
-  (void)end;
   if (start == 0)
     return rl_completion_matches (cmd, ml_command_generator);
   return NULL;
diff --git a/mail/msgset.y b/mail/msgset.y
index 9a61f8a64..88af5e9a9 100644
--- a/mail/msgset.y
+++ b/mail/msgset.y
@@ -651,13 +651,12 @@ select_body (message_t msg, void *closure)
 }
 
 int
-select_sender (message_t msg, void *closure)
+select_sender (message_t msg ARG_UNUSED, void *closure ARG_UNUSED)
 {
   /* char *sender = (char*) closure; */
   /* FIXME: all messages from sender argv[i] */
   /* Annoying we can use address_create() for that
      but to compare against what? The email ?  */
-  (void)msg; (void)closure;
   return 0;
 }
 
@@ -690,12 +689,11 @@ select_type (message_t msg, void *closure)
 }
 
 int
-select_deleted (message_t msg, void *closure)
+select_deleted (message_t msg, void *closure ARG_UNUSED)
 {
   attribute_t attr= NULL;
   int rc;
 
-  (void)closure;
   message_get_attribute (msg, &attr);
   rc = attribute_is_deleted (attr);
   return strcmp (xargv[0], "undelete") == 0 ? rc : !rc;
diff --git a/mail/quit.c b/mail/quit.c
index c6b78aa57..7affa7abb 100644
--- a/mail/quit.c
+++ b/mail/quit.c
@@ -23,9 +23,8 @@
  */
 
 int
-mail_quit (int argc, char **argv)
+mail_quit (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
-  (void)argc; (void)argv;
   if (mail_mbox_close ())
     return 1;
   exit (0);
diff --git a/mail/source.c b/mail/source.c
index 00f7e2d36..519b93ca3 100644
--- a/mail/source.c
+++ b/mail/source.c
@@ -19,13 +19,12 @@
 
 
 static char *
-source_readline(void *closure, int cont)
+source_readline (void *closure, int cont ARG_UNUSED)
 {
   FILE *fp = closure;
   size_t s = 0;
   char *buf = NULL;
   
-  (void)cont; /*unused*/
   if (getline (&buf, &s, fp) >= 0)
     {
       int len = strlen (buf);
diff --git a/mail/summary.c b/mail/summary.c
index 0b981564b..34df036a6 100644
--- a/mail/summary.c
+++ b/mail/summary.c
@@ -22,7 +22,7 @@
    The side effect is that is set the cursor/cursor
    to the newest or read message number.  */
 int
-mail_summary (int argc, char **argv)
+mail_summary (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 {
   message_t msg;
   attribute_t attr;
@@ -31,7 +31,6 @@ mail_summary (int argc, char **argv)
   int mseen = 0, mnew = 0, mdelete = 0;
   int first_new = 0, first_unread = 0;
 
-  (void)argc; (void)argv;
   mailbox_messages_count (mbox, &count);
   for (msgno = 1; msgno <= count; msgno++)
     {
diff --git a/mail/tag.c b/mail/tag.c
index 5e235e564..8c67f2fec 100644
--- a/mail/tag.c
+++ b/mail/tag.c
@@ -21,12 +21,11 @@
 /* unt[ag] [msglist] */
 
 static int
-tag_message (message_t mesg, msgset_t *msgset, void *arg)
+tag_message (message_t mesg, msgset_t *msgset ARG_UNUSED, void *arg)
 {
   attribute_t attr;
   int *action = arg;
 
-  (void)msgset;
   message_get_attribute (mesg, &attr);
   if (*action)
     attribute_set_userflag (attr, MAIL_ATTRIBUTE_TAGGED);
diff --git a/mail/var.c b/mail/var.c
index b79632c31..11326323c 100644
--- a/mail/var.c
+++ b/mail/var.c
@@ -212,9 +212,8 @@ var_command (int argc, char **argv, compose_env_t *env)
 
 /* ~? */
 int
-var_help (int argc, char **argv, compose_env_t *env)
+var_help (int argc, char **argv, compose_env_t *env ARG_UNUSED)
 {
-  (void) env;
   if (argc < 2)
     return util_help (mail_escape_table, NULL);
   else
@@ -232,13 +231,10 @@ var_help (int argc, char **argv, compose_env_t *env)
 /* ~A */
 /* ~a */
 int
-var_sign (int argc, char **argv, compose_env_t *env)
+var_sign (int argc ARG_UNUSED, char **argv, compose_env_t *env ARG_UNUSED)
 {
   char *p;
 
-  (void) argc;
-  (void) env;
-
   if (util_getenv (&p, isupper (argv[0][0]) ? "Sign" : "sign",
 		   Mail_env_string, 1) == 0)
     {
@@ -290,15 +286,12 @@ var_cc (int argc, char **argv, compose_env_t *env)
 
 /* ~d */
 int
-var_deadletter (int argc, char **argv, compose_env_t *env)
+var_deadletter (int argc ARG_UNUSED, char **argv ARG_UNUSED,
+                compose_env_t *env ARG_UNUSED)
 {
   FILE *dead = fopen (getenv ("DEAD"), "r");
   int c;
 
-  (void) argc;
-  (void) argv;
-  (void) env;
-
   while ((c = fgetc (dead)) != EOF)
     fputc (c, ofile);
   fclose (dead);
@@ -375,9 +368,8 @@ var_visual (int argc, char **argv, compose_env_t *env)
 /* ~f[mesg-list] */
 /* ~F[mesg-list] */
 int
-var_print (int argc, char **argv, compose_env_t *env)
+var_print (int argc, char **argv, compose_env_t *env ARG_UNUSED)
 {
-  (void) env;
   return mail_print (argc, argv);
 }
 
@@ -405,11 +397,10 @@ var_headers (int argc, char **argv, compose_env_t *env)
 
 /* ~i[var-name] */
 int
-var_insert (int argc, char **argv, compose_env_t *send_env)
+var_insert (int argc, char **argv, compose_env_t *send_env ARG_UNUSED)
 {
   struct mail_env_entry *env;
 
-  (void) send_env;
   if (var_check_args (argc, argv))
     return 1;
   env = util_find_env (argv[1], 0);
@@ -531,15 +522,13 @@ var_type_input (int argc, char **argv, compose_env_t *env)
 
 /* ~r[filename] */
 int
-var_read (int argc, char **argv, compose_env_t *env)
+var_read (int argc, char **argv, compose_env_t *env ARG_UNUSED)
 {
   char *filename;
   FILE *inf;
   size_t size, lines;
   char buf[512];
 
-  (void) env;
-
   if (var_check_args (argc, argv))
     return 1;
   filename = util_fullpath (argv[1]);
diff --git a/mail/version.c b/mail/version.c
index 8d1d5300f..4a1ff2396 100644
--- a/mail/version.c
+++ b/mail/version.c
@@ -37,9 +37,8 @@ static const char *with_defs[] =
 
 
 int
-mail_version (int argc, char **argv)
-{
-  (void)argc; (void)argv;
+mail_version (int argc ARG_UNUSED, char **argv ARG_UNUSED)
+{ 
   fprintf (ofile, "%s", argp_program_version);
   if (with_defs[0] != NULL)
     {