Use MU_ARG_UNUSED to mark unused formal parameters.

@@ -58,7 +58,7 @@ static int _perr = 0;
 
 static int
 mu_pam_conv (int num_msg, const struct pam_message **msg,
-	     struct pam_response **resp, void *appdata_ptr ARG_UNUSED)
+	     struct pam_response **resp, void *appdata_ptr MU_ARG_UNUSED)
 {
   int replies = 0;
   struct pam_response *reply = NULL;
@@ -102,9 +102,9 @@ mu_pam_conv (int num_msg, const struct pam_message **msg,
 static struct pam_conv PAM_conversation = { &mu_pam_conv, NULL };
 
 int
-mu_authenticate_pam (struct mu_auth_data **return_data ARG_UNUSED,
+mu_authenticate_pam (struct mu_auth_data **return_data MU_ARG_UNUSED,
 		     const void *key,
-		     void *func_data ARG_UNUSED,
+		     void *func_data MU_ARG_UNUSED,
 		     void *call_data)
 {
   const struct mu_auth_data *auth_data = key;
@@ -164,10 +164,10 @@ struct argp mu_pam_argp = {
 #else
 
 int
-mu_authenticate_pam (struct mu_auth_data **return_data ARG_UNUSED,
-		     const void *key ARG_UNUSED,
-		     void *func_data ARG_UNUSED,
-		     void *call_data ARG_UNUSED)
+mu_authenticate_pam (struct mu_auth_data **return_data MU_ARG_UNUSED,
+		     const void *key MU_ARG_UNUSED,
+		     void *func_data MU_ARG_UNUSED,
+		     void *call_data MU_ARG_UNUSED)
 {
   errno = ENOSYS;
   return 1;

@@ -447,9 +447,9 @@ decode_reply (grad_request_t *reply, const char *user_name, char *password,
 }
 
 int
-mu_radius_authenticate (struct mu_auth_data **return_data ARG_UNUSED,
+mu_radius_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED,
 			const void *key,
-			void *func_data ARG_UNUSED, void *call_data)
+			void *func_data MU_ARG_UNUSED, void *call_data)
 {
   int rc;
   grad_request_t *reply;
@@ -569,18 +569,18 @@ struct argp mu_radius_argp = {
 
 #else
 static int
-mu_radius_authenticate (struct mu_auth_data **return_data ARG_UNUSED,
+mu_radius_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED,
 			const void *key,
-			void *func_data ARG_UNUSED, void *call_data)
+			void *func_data MU_ARG_UNUSED, void *call_data)
 {
   return ENOSYS;
 }
 
 static int
-mu_auth_radius_user_by_name (struct mu_auth_data **return_data ARG_UNUSED,
-			     const void *key ARG_UNUSED,
-			     void *func_data ARG_UNUSED,
-			     void *call_data ARG_UNUSED)
+mu_auth_radius_user_by_name (struct mu_auth_data **return_data MU_ARG_UNUSED,
+			     const void *key MU_ARG_UNUSED,
+			     void *func_data MU_ARG_UNUSED,
+			     void *call_data MU_ARG_UNUSED)
 {
   return ENOSYS;
 }

@@ -487,8 +487,8 @@ decode_tuple (mu_sql_connection_t conn, int n,
 static int
 mu_auth_sql_by_name (struct mu_auth_data **return_data,
 		     const void *key,
-		     void *func_data ARG_UNUSED,
-		     void *call_data ARG_UNUSED)
+		     void *func_data MU_ARG_UNUSED,
+		     void *call_data MU_ARG_UNUSED)
 {
   int status, rc;
   char *query_str = NULL;
@@ -567,8 +567,8 @@ mu_auth_sql_by_name (struct mu_auth_data **return_data,
 static int
 mu_auth_sql_by_uid (struct mu_auth_data **return_data,
 		    const void *key,
-		    void *func_data ARG_UNUSED,
-		    void *call_data ARG_UNUSED)
+		    void *func_data MU_ARG_UNUSED,
+		    void *call_data MU_ARG_UNUSED)
 {
   char uidstr[64];
   int status, rc;
@@ -731,9 +731,9 @@ mu_sql_getpass (const char *username, char **passwd)
 }
 
 static int
-mu_sql_authenticate (struct mu_auth_data **return_data ARG_UNUSED,
+mu_sql_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED,
 		     const void *key,
-		     void *func_data ARG_UNUSED, void *call_data)
+		     void *func_data MU_ARG_UNUSED, void *call_data)
 {
   const struct mu_auth_data *auth_data = key;
   char *pass = call_data;

@@ -203,10 +203,10 @@ struct argp mu_virt_argp = {
 
 #else
 static int
-mu_auth_virt_domain_by_name (struct mu_auth_data **return_data ARG_UNUSED,
-			     const void *key ARG_UNUSED,
-			     void *func_data ARG_UNUSED,
-			     void *call_data ARG_UNUSED)
+mu_auth_virt_domain_by_name (struct mu_auth_data **return_data MU_ARG_UNUSED,
+			     const void *key MU_ARG_UNUSED,
+			     void *func_data MU_ARG_UNUSED,
+			     void *call_data MU_ARG_UNUSED)
 {
   return ENOSYS;
 }

@@ -20,7 +20,7 @@
    MA 02110-1301 USA */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>  /* For ARG_UNUSED only */
+# include <config.h>  /* For MU_ARG_UNUSED only */
 #endif 
 #include <sys/types.h>
 #include <unistd.h>
@@ -242,14 +242,14 @@ readline (char *prompt)
 }
 
 void
-add_history (const char *s ARG_UNUSED)
+add_history (const char *s MU_ARG_UNUSED)
 {
 }
 #endif
 
 
 int
-main (int argc ARG_UNUSED, char **argv)
+main (int argc MU_ARG_UNUSED, char **argv)
 {
   char *line, *s;
 
@@ -398,7 +398,7 @@ int com_mode (char *arg)
 }
 
 int
-com_mode_reader (char *arg ARG_UNUSED)
+com_mode_reader (char *arg MU_ARG_UNUSED)
 {
   return mu_nntp_mode_reader (nntp);
 }
@@ -561,7 +561,7 @@ int com_list (char *arg)
 }
 
 int
-com_list_extensions (char *arg ARG_UNUSED)
+com_list_extensions (char *arg MU_ARG_UNUSED)
 {
   mu_iterator_t iterator = NULL;
   int status = mu_nntp_list_extensions (nntp, &iterator);
@@ -660,7 +660,7 @@ com_list_active_times (char *arg)
 }
 
 int
-com_list_distributions (char *arg ARG_UNUSED)
+com_list_distributions (char *arg MU_ARG_UNUSED)
 {
   mu_iterator_t iterator = NULL;
   int status = mu_nntp_list_distributions (nntp, arg, &iterator);
@@ -694,7 +694,7 @@ com_list_distributions (char *arg ARG_UNUSED)
 }
 
 int
-com_list_distrib_pats (char *arg ARG_UNUSED)
+com_list_distrib_pats (char *arg MU_ARG_UNUSED)
 {
   mu_iterator_t iterator = NULL;
   int status = mu_nntp_list_distrib_pats (nntp, &iterator);
@@ -764,7 +764,7 @@ com_list_newsgroups (char *arg)
 }
 
 int
-com_last (char *arg ARG_UNUSED)
+com_last (char *arg MU_ARG_UNUSED)
 {
   char *mid = NULL;
   unsigned long number = 0;
@@ -779,7 +779,7 @@ com_last (char *arg ARG_UNUSED)
 }
 
 int
-com_next (char *arg ARG_UNUSED)
+com_next (char *arg MU_ARG_UNUSED)
 {
   char *mid = NULL;
   unsigned long number = 0;
@@ -922,7 +922,7 @@ com_stat (char *arg)
 }
 
 int
-com_date (char *arg ARG_UNUSED)
+com_date (char *arg MU_ARG_UNUSED)
 {
   unsigned int year, month, day, hour, min, sec;
   int status;
@@ -950,7 +950,7 @@ com_ihave (char *arg)
 }
 
 int
-com_help (char *arg ARG_UNUSED)
+com_help (char *arg MU_ARG_UNUSED)
 {
   mu_stream_t stream = NULL;
   int status;
@@ -1054,7 +1054,7 @@ com_connect (char *arg)
 }
 
 int
-com_disconnect (char *arg ARG_UNUSED)
+com_disconnect (char *arg MU_ARG_UNUSED)
 {
   (void) arg;
   if (nntp)
@@ -1067,7 +1067,7 @@ com_disconnect (char *arg ARG_UNUSED)
 }
 
 int
-com_quit (char *arg ARG_UNUSED)
+com_quit (char *arg MU_ARG_UNUSED)
 {
   int status = 0;
   if (nntp)
@@ -1087,7 +1087,7 @@ com_quit (char *arg ARG_UNUSED)
 }
 
 int
-com_exit (char *arg ARG_UNUSED)
+com_exit (char *arg MU_ARG_UNUSED)
 {
   if (nntp)
     {

@@ -20,7 +20,7 @@
    MA 02110-1301 USA */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>  /* For ARG_UNUSED only */
+# include <config.h>  /* For MU_ARG_UNUSED only */
 #endif 
 #include <sys/types.h>
 #include <unistd.h>
@@ -229,14 +229,14 @@ readline (char *prompt)
 }
 
 void
-add_history (const char *s ARG_UNUSED)
+add_history (const char *s MU_ARG_UNUSED)
 {
 }
 #endif
 
 
 int
-main (int argc ARG_UNUSED, char **argv)
+main (int argc MU_ARG_UNUSED, char **argv)
 {
   char *line, *s;
 
@@ -398,7 +398,7 @@ com_apop (char *arg)
 }
 
 int
-com_capa (char *arg ARG_UNUSED)
+com_capa (char *arg MU_ARG_UNUSED)
 {
   mu_iterator_t iterator = NULL;
   int status = mu_pop3_capa (pop3, &iterator);
@@ -483,7 +483,7 @@ com_list (char *arg)
 }
 
 int
-com_noop (char *arg ARG_UNUSED)
+com_noop (char *arg MU_ARG_UNUSED)
 {
   return mu_pop3_noop (pop3);
 }
@@ -526,7 +526,7 @@ com_pass (char *arg)
 }
 
 int
-com_stat (char *arg ARG_UNUSED)
+com_stat (char *arg MU_ARG_UNUSED)
 {
   unsigned count, size;
   int status = 0;
@@ -588,7 +588,7 @@ com_help (char *arg)
 }
 
 int
-com_rset (char *arg ARG_UNUSED)
+com_rset (char *arg MU_ARG_UNUSED)
 {
   return mu_pop3_rset (pop3);
 }
@@ -694,7 +694,7 @@ com_connect (char *arg)
 }
 
 int
-com_disconnect (char *arg ARG_UNUSED)
+com_disconnect (char *arg MU_ARG_UNUSED)
 {
   (void) arg;
   if (pop3)
@@ -707,7 +707,7 @@ com_disconnect (char *arg ARG_UNUSED)
 }
 
 int
-com_quit (char *arg ARG_UNUSED)
+com_quit (char *arg MU_ARG_UNUSED)
 {
   int status = 0;
   if (pop3)
@@ -727,7 +727,7 @@ com_quit (char *arg ARG_UNUSED)
 }
 
 int
-com_exit (char *arg ARG_UNUSED)
+com_exit (char *arg MU_ARG_UNUSED)
 {
   if (pop3)
     {

@@ -67,7 +67,7 @@ print_capa (void *item, void *data)
 }
 
 int
-imap4d_capability (struct imap4d_command *command, char *arg ARG_UNUSED)
+imap4d_capability (struct imap4d_command *command, char *arg MU_ARG_UNUSED)
 {
   util_send ("* CAPABILITY");
 

@@ -25,7 +25,7 @@
  */
 
 int
-imap4d_check (struct imap4d_command *command, char *arg ARG_UNUSED)
+imap4d_check (struct imap4d_command *command, char *arg MU_ARG_UNUSED)
 {
   return util_finish (command, RESP_OK, "Completed");
 }

@@ -25,7 +25,7 @@
    mailbox all messages that have the \\Deleted flag set, and returns
    to authenticated state from selected state.  */
 int
-imap4d_close (struct imap4d_command *command, char *arg ARG_UNUSED)
+imap4d_close (struct imap4d_command *command, char *arg MU_ARG_UNUSED)
 {
   const char *msg = NULL;
   int status, flags;

@@ -280,7 +280,7 @@ fetch_fast (struct fetch_command *command, char **arg)
    Header: Date, Subject, From, Sender, Reply-To, To, Cc, Bcc, In-Reply-To,
    and Message-Id.  */
 static int
-fetch_envelope (struct fetch_command *command, char **arg ARG_UNUSED)
+fetch_envelope (struct fetch_command *command, char **arg MU_ARG_UNUSED)
 {
   int status;
   util_send ("%s (", command->name);
@@ -347,7 +347,7 @@ fetch_flags (struct fetch_command *command, char **arg)
    ;; from the given time will give the UT form.
    ;; The Universal Time zone is "+0000".  */
 static int
-fetch_internaldate (struct fetch_command *command, char **arg ARG_UNUSED)
+fetch_internaldate (struct fetch_command *command, char **arg MU_ARG_UNUSED)
 {
   char date[128];
   mu_envelope_t env = NULL;
@@ -378,7 +378,7 @@ fetch_internaldate (struct fetch_command *command, char **arg ARG_UNUSED)
   Functionally equivalent to BODY.PEEK[HEADER], differing in the syntax of
   the resulting untagged FETCH data (RFC822.HEADER is returned). */
 static int
-fetch_rfc822_header (struct fetch_command *command, char **arg ARG_UNUSED)
+fetch_rfc822_header (struct fetch_command *command, char **arg MU_ARG_UNUSED)
 {
   char buffer[32];
   char *p = buffer;
@@ -391,7 +391,7 @@ fetch_rfc822_header (struct fetch_command *command, char **arg ARG_UNUSED)
    Functionally equivalent to BODY[TEXT], differing in the syntax of the
    resulting untagged FETCH data (RFC822.TEXT is returned). */
 static int
-fetch_rfc822_text (struct fetch_command *command, char **arg ARG_UNUSED)
+fetch_rfc822_text (struct fetch_command *command, char **arg MU_ARG_UNUSED)
 {
   char buffer[16];
   char *p = buffer;
@@ -402,7 +402,7 @@ fetch_rfc822_text (struct fetch_command *command, char **arg ARG_UNUSED)
 
 /* The [RFC-822] size of the message.  */
 static int
-fetch_rfc822_size (struct fetch_command *command, char **arg ARG_UNUSED)
+fetch_rfc822_size (struct fetch_command *command, char **arg MU_ARG_UNUSED)
 {
   size_t size = 0;
   size_t lines = 0;
@@ -457,7 +457,7 @@ fetch_rfc822 (struct fetch_command *command, char **arg)
 
 /* UID: The unique identifier for the message.  */
 static int
-fetch_uid (struct fetch_command *command, char **arg ARG_UNUSED)
+fetch_uid (struct fetch_command *command, char **arg MU_ARG_UNUSED)
 {
   size_t uid = 0;
 
@@ -471,7 +471,7 @@ fetch_uid (struct fetch_command *command, char **arg ARG_UNUSED)
    server by parsing the [MIME-IMB] header fields in the [RFC-822] header and
    [MIME-IMB] headers.  */
 static int
-fetch_bodystructure (struct fetch_command *command, char **arg ARG_UNUSED)
+fetch_bodystructure (struct fetch_command *command, char **arg MU_ARG_UNUSED)
 {
   util_send ("%s (", command->name);
   fetch_bodystructure0 (command->msg, 1); /* 1 means with extension data.  */

@@ -1952,21 +1952,21 @@ imap_fetch (f_imap_t f_imap)
 }
 
 static int
-imap_search (f_imap_t f_imap ARG_UNUSED)
+imap_search (f_imap_t f_imap MU_ARG_UNUSED)
 {
   /* Not implemented.  No provision for this in the API, yet.  */
   return 0;
 }
 
 static int
-imap_status (f_imap_t f_imap ARG_UNUSED)
+imap_status (f_imap_t f_imap MU_ARG_UNUSED)
 {
   /* Not implemented.  No provision for this in the API, yet.  */
   return 0;
 }
 
 static int
-imap_expunge (f_imap_t f_imap ARG_UNUSED, unsigned msgno ARG_UNUSED)
+imap_expunge (f_imap_t f_imap MU_ARG_UNUSED, unsigned msgno MU_ARG_UNUSED)
 {
   /* We should not have this, since do not send the expunge, but rather
      use SELECT/CLOSE.  */

@@ -36,7 +36,7 @@
 static void url_imap_destroy (mu_url_t url);
 
 static void
-url_imap_destroy (mu_url_t url ARG_UNUSED)
+url_imap_destroy (mu_url_t url MU_ARG_UNUSED)
 {
 }
 

@@ -36,7 +36,7 @@
 #include <amd.h>
 
 static int
-_maildir_folder_init (mu_folder_t folder ARG_UNUSED)
+_maildir_folder_init (mu_folder_t folder MU_ARG_UNUSED)
 {
   return 0;
 }

@@ -580,7 +580,7 @@ maildir_scan_dir (struct _amd_data *amd, DIR *dir)
 }
 
 static int
-maildir_scan0 (mu_mailbox_t mailbox, size_t msgno ARG_UNUSED, size_t *pcount, 
+maildir_scan0 (mu_mailbox_t mailbox, size_t msgno MU_ARG_UNUSED, size_t *pcount, 
 	       int do_notify)
 {
   struct _amd_data *amd = mailbox->data;

@@ -193,7 +193,7 @@ folder_mbox_destroy (mu_folder_t folder)
 
 /* Noop. */
 static int
-folder_mbox_open (mu_folder_t folder, int flags ARG_UNUSED)
+folder_mbox_open (mu_folder_t folder, int flags MU_ARG_UNUSED)
 {
   fmbox_t fmbox = folder->data;
   if (flags & MU_STREAM_CREAT)
@@ -205,7 +205,7 @@ folder_mbox_open (mu_folder_t folder, int flags ARG_UNUSED)
 
 /*  Noop.  */
 static int
-folder_mbox_close (mu_folder_t folder ARG_UNUSED)
+folder_mbox_close (mu_folder_t folder MU_ARG_UNUSED)
 {
   return 0;
 }
@@ -406,7 +406,7 @@ folder_mbox_list (mu_folder_t folder, const char *dirname, const char *pattern,
 }
 
 static int
-folder_mbox_lsub (mu_folder_t folder, const char *ref ARG_UNUSED,
+folder_mbox_lsub (mu_folder_t folder, const char *ref MU_ARG_UNUSED,
 		  const char *name,
 		  mu_list_t flist)
 {

@@ -37,7 +37,7 @@
 static void url_mbox_destroy (mu_url_t purl);
 
 static void
-url_mbox_destroy (mu_url_t url ARG_UNUSED)
+url_mbox_destroy (mu_url_t url MU_ARG_UNUSED)
 {
 }
 
@@ -259,7 +259,7 @@ _url_mbox_init (mu_url_t url)
 }
 
 static void
-url_path_destroy (mu_url_t url ARG_UNUSED)
+url_path_destroy (mu_url_t url MU_ARG_UNUSED)
 {
 }
 

@@ -39,7 +39,7 @@
 #include <mailutils/mutil.h>
 
 static int
-_mh_folder_init (mu_folder_t folder ARG_UNUSED)
+_mh_folder_init (mu_folder_t folder MU_ARG_UNUSED)
 {
   return 0;
 }

@@ -127,7 +127,7 @@ _mh_get_message_seq (struct _amd_data *amd, size_t seq)
 
 /* Scan the mailbox */
 static int
-mh_scan0 (mu_mailbox_t mailbox, size_t msgno ARG_UNUSED, size_t *pcount, 
+mh_scan0 (mu_mailbox_t mailbox, size_t msgno MU_ARG_UNUSED, size_t *pcount, 
           int do_notify)
 {
   struct _amd_data *amd = mailbox->data;

@@ -37,7 +37,7 @@
 static void url_nntp_destroy (mu_url_t url);
 
 static void
-url_nntp_destroy (mu_url_t url ARG_UNUSED)
+url_nntp_destroy (mu_url_t url MU_ARG_UNUSED)
 {
 }
 

@@ -1848,7 +1848,7 @@ fill_buffer (pop_data_t mpd, char *buffer, size_t buflen)
 /* The heart of most funtions.  Send the RETR and skip different parts.  */
 static int
 pop_retr (pop_message_t mpm, char *buffer, size_t buflen,  
-          mu_off_t offset ARG_UNUSED, size_t *pnread)
+          mu_off_t offset MU_ARG_UNUSED, size_t *pnread)
 {
   pop_data_t mpd;
   size_t nread = 0;

@@ -36,7 +36,7 @@
 static void url_pop_destroy (mu_url_t url);
 
 static void
-url_pop_destroy (mu_url_t url ARG_UNUSED)
+url_pop_destroy (mu_url_t url MU_ARG_UNUSED)
 {
 }
 

@@ -253,7 +253,7 @@ spamd_abort (mu_sieve_machine_t mach, mu_stream_t *stream, signal_handler handle
 static int got_sigpipe;
 
 static RETSIGTYPE
-sigpipe_handler (int sig ARG_UNUSED)
+sigpipe_handler (int sig MU_ARG_UNUSED)
 {
   got_sigpipe = 1;
 }

@@ -352,7 +352,8 @@ sieve_print_value (mu_sieve_value_t *val, mu_sieve_printf_t printer, void *data)
       break;
       
     case SVT_NUMBER:
-      sieve_debug_internal (printer, data, "%ld", val->v.number);
+      sieve_debug_internal (printer, data, "%lu",
+			    (unsigned long) val->v.number);
       break;
       
     case SVT_TAG:

@@ -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;

@@ -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;

@@ -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);

@@ -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;
 

@@ -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)
     {

@@ -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))
     {

@@ -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;

@@ -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"

@@ -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)
 {
 }
 

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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)

@@ -1107,7 +1107,7 @@ amd_is_updated (mu_mailbox_t mailbox)
 }
 
 static int
-amd_get_size (mu_mailbox_t mailbox ARG_UNUSED, mu_off_t *psize ARG_UNUSED)
+amd_get_size (mu_mailbox_t mailbox MU_ARG_UNUSED, mu_off_t *psize MU_ARG_UNUSED)
 {
   /*FIXME*/
   return ENOSYS;
@@ -1482,7 +1482,7 @@ amd_envelope_sender (mu_envelope_t envelope, char *buf, size_t len, size_t *psiz
 }
 
 static void
-amd_url_destroy (mu_url_t url ARG_UNUSED)
+amd_url_destroy (mu_url_t url MU_ARG_UNUSED)
 {
 }
 

@@ -30,7 +30,7 @@
 #include <auth0.h>
 
 static int
-_authenticate_null (mu_authority_t auth ARG_UNUSED)
+_authenticate_null (mu_authority_t auth MU_ARG_UNUSED)
 {
   return 0;
 }

@@ -707,7 +707,7 @@ _prog_stream_unregister (struct _prog_stream *stream)
 }
 
 static int
-_prog_waitpid (void *item, void *data ARG_UNUSED)
+_prog_waitpid (void *item, void *data MU_ARG_UNUSED)
 {
   struct _prog_stream *str = item;
   int status;

@@ -332,7 +332,7 @@ copy_pass (struct icvt_stream *s, char *optr, size_t osize, size_t *pnbytes)
 
 static int
 _icvt_read (mu_stream_t stream, char *optr, size_t osize,
-	    mu_off_t offset ARG_UNUSED, size_t *pnbytes)
+	    mu_off_t offset MU_ARG_UNUSED, size_t *pnbytes)
 {
   struct icvt_stream *s = mu_stream_get_owner (stream);
 

@@ -168,7 +168,7 @@ static const char _hexdigits[] = "0123456789ABCDEF";
 
 static int
 qp_decode (const char *iptr, size_t isize, char *optr, size_t osize,
-	   size_t *nbytes, int *line_len ARG_UNUSED)
+	   size_t *nbytes, int *line_len MU_ARG_UNUSED)
 {
   char c;
   int last_char = 0;
@@ -413,7 +413,7 @@ b64_input (char c)
 
 static int
 base64_decode (const char *iptr, size_t isize, char *optr, size_t osize,
-	       size_t *nbytes, int *line_len ARG_UNUSED)
+	       size_t *nbytes, int *line_len MU_ARG_UNUSED)
 {
   int i = 0, tmp = 0, pad = 0;
   size_t consumed = 0;
@@ -578,7 +578,7 @@ static struct _mu_filter_record _B_filter =
 /* RFC 2047 "Q" Encoding */
 static int
 Q_decode (const char *iptr, size_t isize, char *optr, size_t osize,
-	   size_t *nbytes, int *line_len ARG_UNUSED)
+	   size_t *nbytes, int *line_len MU_ARG_UNUSED)
 {
   char c;
   size_t consumed = 0;

@@ -392,7 +392,7 @@ _body_stream_size (mu_stream_t stream, mu_off_t *psize)
 }
 
 static int
-_body_stream_flush (mu_stream_t str ARG_UNUSED)
+_body_stream_flush (mu_stream_t str MU_ARG_UNUSED)
 {
   return 0;
 }

@@ -193,13 +193,13 @@ mu_monitor_unlock (mu_monitor_t monitor)
 }
 
 int
-mu_monitor_wait (mu_monitor_t monitor ARG_UNUSED)
+mu_monitor_wait (mu_monitor_t monitor MU_ARG_UNUSED)
 {
   return ENOSYS;
 }
 
 int
-mu_monitor_notify (mu_monitor_t monitor ARG_UNUSED)
+mu_monitor_notify (mu_monitor_t monitor MU_ARG_UNUSED)
 {
   return ENOSYS;
 }

@@ -175,10 +175,10 @@ mu_auth_runlist (mu_list_t flist, struct mu_auth_data **return_data,
 }
 
 int
-mu_auth_nosupport (struct mu_auth_data **return_data ARG_UNUSED,
-		   const void *key ARG_UNUSED,
-		   void *func_data ARG_UNUSED,
-		   void *call_data ARG_UNUSED)
+mu_auth_nosupport (struct mu_auth_data **return_data MU_ARG_UNUSED,
+		   const void *key MU_ARG_UNUSED,
+		   void *func_data MU_ARG_UNUSED,
+		   void *call_data MU_ARG_UNUSED)
 {
   return ENOSYS;
 }

@@ -789,7 +789,7 @@ static SYMBOL const mil_tz_tab[] = {
 
 /* ARGSUSED */
 static int
-yyerror (char *s ARG_UNUSED)
+yyerror (char *s MU_ARG_UNUSED)
 {
   return 0;
 }

@@ -75,8 +75,8 @@ mu_auth_system (struct mu_auth_data **return_data, const struct passwd *pw)
 int
 mu_auth_system_by_name (struct mu_auth_data **return_data,
 			const void *key,
-			void *func_data ARG_UNUSED,
-			void *call_data ARG_UNUSED)
+			void *func_data MU_ARG_UNUSED,
+			void *call_data MU_ARG_UNUSED)
 {
   if (!key)
     return EINVAL;
@@ -86,8 +86,8 @@ mu_auth_system_by_name (struct mu_auth_data **return_data,
 static int
 mu_auth_system_by_uid (struct mu_auth_data **return_data,
 		       const void *key,
-		       void *func_data ARG_UNUSED,
-		       void *call_data ARG_UNUSED)
+		       void *func_data MU_ARG_UNUSED,
+		       void *call_data MU_ARG_UNUSED)
 {
   if (!key)
     return EINVAL;
@@ -95,9 +95,9 @@ mu_auth_system_by_uid (struct mu_auth_data **return_data,
 }
 
 static int
-mu_authenticate_generic (struct mu_auth_data **return_data ARG_UNUSED,
+mu_authenticate_generic (struct mu_auth_data **return_data MU_ARG_UNUSED,
 			 const void *key,
-			 void *func_data ARG_UNUSED,
+			 void *func_data MU_ARG_UNUSED,
 			 void *call_data)
 {
   const struct mu_auth_data *auth_data = key;
@@ -113,9 +113,9 @@ mu_authenticate_generic (struct mu_auth_data **return_data ARG_UNUSED,
 
 /* Called only if generic fails */
 static int
-mu_authenticate_system (struct mu_auth_data **return_data ARG_UNUSED,
+mu_authenticate_system (struct mu_auth_data **return_data MU_ARG_UNUSED,
 			const void *key,
-			void *func_data ARG_UNUSED,
+			void *func_data MU_ARG_UNUSED,
 			void *call_data)
 {
   const struct mu_auth_data *auth_data = key;

@@ -40,7 +40,7 @@
 static void url_sendmail_destroy (mu_url_t purl);
 
 static void
-url_sendmail_destroy (mu_url_t url ARG_UNUSED)
+url_sendmail_destroy (mu_url_t url MU_ARG_UNUSED)
 {
 }
 

@@ -167,7 +167,7 @@ ali_print_name_list (mu_list_t list, int off)
 }
 
 static int
-ali_print_alias (char *name, mu_list_t alias, void *data ARG_UNUSED)
+ali_print_alias (char *name, mu_list_t alias, void *data MU_ARG_UNUSED)
 {
   int n;
   

@@ -89,7 +89,7 @@ mhparam_defval (char *comp)
 }
 
 int
-mhparam_iterator (const char *comp, const char *value, void *data ARG_UNUSED)
+mhparam_iterator (const char *comp, const char *value, void *data MU_ARG_UNUSED)
 {
   if (display_comp_name)
     printf("%s:\t", comp);

@@ -21,7 +21,7 @@
 /* AUTH is not yet implemented */
 
 int
-pop3d_auth (const char *arg ARG_UNUSED)
+pop3d_auth (const char *arg MU_ARG_UNUSED)
 {
   if (state != AUTHORIZATION)
     return ERR_WRONG_STATE;

@@ -35,7 +35,7 @@ process_cleanup ()
 }
 
 RETSIGTYPE
-pop3d_sigchld (int signo ARG_UNUSED)
+pop3d_sigchld (int signo MU_ARG_UNUSED)
 {
   need_cleanup = 1;
 #ifndef HAVE_SIGACTION

@@ -179,7 +179,7 @@ store_result (mu_sql_connection_t conn)
 }
 
 static int
-free_char_data (void *item, void *data ARG_UNUSED)
+free_char_data (void *item, void *data MU_ARG_UNUSED)
 {
   free (item);
   return 0;