Use ARG_UNUSED where necessary

@@ -57,11 +57,10 @@ static int _perr = 0;
 
 static int
 mu_pam_conv (int num_msg, const struct pam_message **msg,
-	     struct pam_response **resp, void *appdata_ptr)
+	     struct pam_response **resp, void *appdata_ptr ARG_UNUSED)
 {
   int replies = 0;
   struct pam_response *reply = NULL;
-  (void)appdata_ptr;
 
   reply = malloc (sizeof (*reply) * num_msg);
   if (!reply)

@@ -66,9 +66,8 @@ print_capa (void *item, void *data)
 }
 
 int
-imap4d_capability (struct imap4d_command *command, char *arg)
+imap4d_capability (struct imap4d_command *command, char *arg ARG_UNUSED)
 {
-  (void) arg;
   util_send ("* CAPABILITY");
 
   list_do (capa_list, print_capa, NULL);

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

@@ -21,9 +21,8 @@
  */
 
 int
-imap4d_close (struct imap4d_command *command, char *arg)
+imap4d_close (struct imap4d_command *command, char *arg ARG_UNUSED)
 {
-  (void)arg;
   /* FIXME: Check and report errors.  */
   /* The CLOSE command permanently removes from the currently selected
      mailbox all messages that have the \\Deleted flag set, and returns

@@ -268,10 +268,9 @@ 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)
+fetch_envelope (struct fetch_command *command, char **arg ARG_UNUSED)
 {
   int status;
-  (void)arg; /* No arguments.  */
   util_send ("%s (", command->name);
   status = fetch_envelope0 (command->msg);
   util_send (")");
@@ -336,14 +335,13 @@ 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)
+fetch_internaldate (struct fetch_command *command, char **arg ARG_UNUSED)
 {
   char date[128], *p;
   envelope_t env = NULL;
   struct tm tm;
   mu_timezone tz;
 
-  (void)arg; /* No arguments.  */
   message_get_envelope (command->msg, &env);
   date[0] = '\0';
   envelope_date (env, date, sizeof (date), NULL);
@@ -360,11 +358,11 @@ fetch_internaldate (struct fetch_command *command, char **arg)
   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)
+fetch_rfc822_header (struct fetch_command *command, char **arg ARG_UNUSED)
 {
   char buffer[32];
   char *p = buffer;
-  (void)arg; /* No arguments.  */
+
   strcpy (buffer, ".PEEK[HEADER]");
   fetch_body (command, &p);
   return RESP_OK;
@@ -374,11 +372,11 @@ fetch_rfc822_header (struct fetch_command *command, char **arg)
    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)
+fetch_rfc822_text (struct fetch_command *command, char **arg ARG_UNUSED)
 {
   char buffer[16];
   char *p = buffer;
-  (void)arg; /* No arguments.  */
+
   strcpy (buffer, "[TEXT]");
   fetch_body (command, &p);
   return RESP_OK;
@@ -386,11 +384,11 @@ fetch_rfc822_text (struct fetch_command *command, char **arg)
 
 /* The [RFC-822] size of the message.  */
 static int
-fetch_rfc822_size (struct fetch_command *command, char **arg)
+fetch_rfc822_size (struct fetch_command *command, char **arg ARG_UNUSED)
 {
   size_t size = 0;
   size_t lines = 0;
-  (void)arg; /* No arguments.  */
+  
   message_size (command->msg, &size);
   message_lines (command->msg, &lines);
   util_send ("%s %u", command->name, size + lines);
@@ -441,10 +439,10 @@ 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)
+fetch_uid (struct fetch_command *command, char **arg ARG_UNUSED)
 {
   size_t uid = 0;
-  (void)arg; /* No arguments.  */
+
   message_get_uid (command->msg, &uid);
   util_send ("%s %d", command->name, uid);
   return RESP_OK;
@@ -455,9 +453,8 @@ fetch_uid (struct fetch_command *command, char **arg)
    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)
+fetch_bodystructure (struct fetch_command *command, char **arg ARG_UNUSED)
 {
-  (void)arg; /* No arguments.  */
   util_send ("%s (", command->name);
   fetch_bodystructure0 (command->msg, 1); /* 1 means with extension data.  */
   util_send (")");

@@ -92,11 +92,10 @@
 #define MAXFD 64
 
 void
-waitdaemon_timeout (int signo)
+waitdaemon_timeout (int signo ARG_UNUSED)
 {
   int left;
 
-  (void)signo;
   left = alarm (0);
   signal (SIGALRM, SIG_DFL);
   if (left == 0)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -37,9 +37,8 @@ static const char *with_defs[] =
 
 
 int
-mail_version (int argc, char **argv)
+mail_version (int argc ARG_UNUSED, char **argv ARG_UNUSED)
 { 
-  (void)argc; (void)argv;
   fprintf (ofile, "%s", argp_program_version);
   if (with_defs[0] != NULL)
     {

@@ -28,9 +28,8 @@
 
 
 static int
-_authenticate_null (authority_t auth)
+_authenticate_null (authority_t auth ARG_UNUSED)
 {
-  (void) auth;
   return 0;
 }
 

@@ -105,7 +105,6 @@ body_get_owner (body_t body)
 int
 body_is_modified (body_t body)
 {
-  (void)body;
   return (body) ? (body->flags & BODY_MODIFIED) : 0;
 }
 

@@ -267,13 +267,12 @@ base64_init (filter_t filter)
 
 static int
 base64_decode (const char *iptr, size_t isize, char *optr, size_t osize,
-	       size_t *nbytes, int *line_len)
+	       size_t *nbytes, int *line_len ARG_UNUSED)
 {
   int i = 0, tmp = 0, pad = 0;
   size_t consumed = 0;
   unsigned char data[4];
 
-  (void) line_len;
   *nbytes = 0;
   while (consumed < isize && (*nbytes)+3 < osize)
     {
@@ -376,13 +375,12 @@ qp_init (filter_t filter)
 
 static int
 qp_decode (const char *iptr, size_t isize, char *optr, size_t osize,
-	   size_t *nbytes, int *line_len)
+	   size_t *nbytes, int *line_len ARG_UNUSED)
 {
   char c;
   int last_char = 0;
   size_t consumed = 0;
 
-  (void)line_len;
   *nbytes = 0;
   while (consumed < isize && *nbytes < osize)
     {

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

@@ -35,9 +35,8 @@
 static void url_imap_destroy (url_t url);
 
 static void
-url_imap_destroy (url_t url)
+url_imap_destroy (url_t url ARG_UNUSED)
 {
-  (void)url;
 }
 
 /*

@@ -314,7 +314,7 @@ folder_mbox_list (folder_t folder, const char *dirname, const char *pattern,
 }
 
 static int
-folder_mbox_lsub (folder_t folder, const char *ref, const char *name,
+folder_mbox_lsub (folder_t folder, const char *ref ARG_UNUSED, const char *name,
 		  struct folder_list *pflist)
 {
   fmbox_t fmbox = folder->data;
@@ -323,7 +323,6 @@ folder_mbox_lsub (folder_t folder, const char *ref, const char *name,
   if (pflist == NULL)
     return EINVAL;
 
-  (void)ref;
   if (name == NULL || *name == '\0')
     name = "*";
 

@@ -34,9 +34,8 @@
 static void url_mbox_destroy (url_t purl);
 
 static void
-url_mbox_destroy (url_t url)
+url_mbox_destroy (url_t url ARG_UNUSED)
 {
-  (void) url;
 }
 
 /* Default mailbox path generator */

@@ -43,9 +43,8 @@ static struct _record _mh_record =
 record_t mh_record = &_mh_record;
 
 int
-_folder_mh_init (folder_t folder)
+_folder_mh_init (folder_t folder ARG_UNUSED)
 {
-  (void)folder;
   return 0;
 }
 

@@ -1004,7 +1004,8 @@ mh_scan_message (struct _mh_message *mhm)
 
 /* Scan the mailbox */
 static int
-mh_scan0 (mailbox_t mailbox, size_t msgno, size_t *pcount, int do_notify)
+mh_scan0 (mailbox_t mailbox, size_t msgno ARG_UNUSED, size_t *pcount, 
+          int do_notify)
 {
   struct _mh_data *mhd = mailbox->data;
   struct _mh_message *msg;
@@ -1012,7 +1013,6 @@ mh_scan0 (mailbox_t mailbox, size_t msgno, size_t *pcount, int do_notify)
   struct dirent *entry;
   int status = 0;
   struct stat st;
-  (void)msgno;
 
   if (mhd == NULL)
     return EINVAL;
@@ -1154,11 +1154,9 @@ mh_is_updated (mailbox_t mailbox)
 }
 
 static int
-mh_get_size (mailbox_t mailbox, off_t *psize)
+mh_get_size (mailbox_t mailbox ARG_UNUSED, off_t *psize ARG_UNUSED)
 {
   /*FIXME*/
-  (void)mailbox;
-  (void)psize;
   return ENOSYS;
 }
 

@@ -29,9 +29,8 @@
 #include <registrar0.h>
 
 static void
-url_mh_destroy (url_t url)
+url_mh_destroy (url_t url ARG_UNUSED)
 {
-  (void) url;
 }
 
 /*

@@ -192,16 +192,14 @@ monitor_unlock (monitor_t monitor)
 }
 
 int
-monitor_wait (monitor_t monitor)
+monitor_wait (monitor_t monitor ARG_UNUSED)
 {
-  (void)monitor;
   return ENOSYS;
 }
 
 int
-monitor_notify (monitor_t monitor)
+monitor_notify (monitor_t monitor ARG_UNUSED)
 {
-  (void)monitor;
   return ENOSYS;
 }
 

@@ -20,7 +20,8 @@
    It was originally written by Steven M. Bellovin <smb@research.att.com>
    while at the University of North Carolina at Chapel Hill.  Later tweaked
    by a couple of people on Usenet.  Completely overhauled by Rich $alz
-   <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990. */
+   <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990.
+   Rewritten using a proper union by Sergey Poznyakoff <gray@gnu.org> */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -787,7 +788,7 @@ static SYMBOL const mil_tz_tab[] = {
 
 /* ARGSUSED */
 static int
-yyerror (char *s ATTRIBUTE_UNUSED)
+yyerror (char *s ARG_UNUSED)
 {
   return 0;
 }
@@ -1169,19 +1170,19 @@ main (int argc, char *argv[])
 
   if (argc > 1 && strcmp (argv[1], "-d") == 0)
     yydebug++;
-  (void) printf ("Enter date, or blank line to exit.\n\t> ");
-  (void) fflush (stdout);
+  printf ("Enter date, or blank line to exit.\n\t> ");
+  fflush (stdout);
 
   buff[MAX_BUFF_LEN] = 0;
   while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
     {
       d = get_date (buff, (time_t *) NULL);
       if (d == -1)
-	(void) printf ("Bad format - couldn't convert.\n");
+	printf ("Bad format - couldn't convert.\n");
       else
-	(void) printf ("%s", ctime (&d));
-      (void) printf ("\t> ");
-      (void) fflush (stdout);
+	printf ("%s", ctime (&d));
+      printf ("\t> ");
+      fflush (stdout);
     }
   exit (0);
   /* NOTREACHED */

@@ -1655,17 +1655,14 @@ 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, off_t offset,
-	  size_t *pnread)
+pop_retr (pop_message_t mpm, char *buffer, size_t buflen,  
+          off_t offset ARG_UNUSED, size_t *pnread)
 {
   pop_data_t mpd;
   size_t nread = 0;
   int status = 0;
   size_t oldbuflen = buflen;
 
-  /* Meaningless.  */
-  (void)offset;
-
   mpd = mpm->mpd;
 
   if (pnread)

@@ -35,9 +35,8 @@
 static void url_pop_destroy (url_t url);
 
 static void
-url_pop_destroy (url_t url)
+url_pop_destroy (url_t url ARG_UNUSED)
 {
-  (void)url;
 }
 
 /*

@@ -186,7 +186,7 @@ stream_read (stream_t is, char *buf, size_t count,
 	  /* Drain the buffer first.  */
 	  if (is->rbuffer.count > 0 && offset == is->rbuffer.offset)
 	    {
-	      (void)memcpy(buf, is->rbuffer.ptr, is->rbuffer.count);
+	      memcpy(buf, is->rbuffer.ptr, is->rbuffer.count);
 	      is->rbuffer.offset += is->rbuffer.count;
 	      residue -= is->rbuffer.count;
 	      buf += is->rbuffer.count;
@@ -219,7 +219,7 @@ stream_read (stream_t is, char *buf, size_t count,
       /* Drain the buffer, if we have less then requested.  */
       while (residue > (size_t)(r = is->rbuffer.count))
 	{
-	  (void)memcpy (buf, is->rbuffer.ptr, (size_t)r);
+	  memcpy (buf, is->rbuffer.ptr, (size_t)r);
 	  /* stream->rbuffer.count = 0 ... done in refill */
 	  is->rbuffer.ptr += r;
 	  is->rbuffer.offset += r;
@@ -246,7 +246,7 @@ stream_read (stream_t is, char *buf, size_t count,
 	      return status;
 	    }
 	}
-      (void)memcpy(buf, is->rbuffer.ptr, residue);
+      memcpy(buf, is->rbuffer.ptr, residue);
       is->rbuffer.count -= residue;
       is->rbuffer.ptr += residue;
       is->rbuffer.offset += residue;
@@ -371,7 +371,7 @@ stream_readline (stream_t is, char *buf, size_t count,
 	      is->rbuffer.count -= len;
 	      is->rbuffer.ptr = nl;
 	      is->rbuffer.offset += len;
-	      (void)memcpy ((void *)s, (void *)p, len);
+	      memcpy ((void *)s, (void *)p, len);
 	      total += len;
 	      s[len] = 0;
 	      if (pnread)
@@ -381,7 +381,7 @@ stream_readline (stream_t is, char *buf, size_t count,
 	  is->rbuffer.count -= len;
 	  is->rbuffer.ptr += len;
 	  is->rbuffer.offset += len;
-	  (void)memcpy((void *)s, (void *)p, len);
+	  memcpy((void *)s, (void *)p, len);
 	  total += len;
 	  s += len;
 	  count -= len;

@@ -29,9 +29,8 @@
 static void url_file_destroy (url_t purl);
 
 static void
-url_file_destroy (url_t url)
+url_file_destroy (url_t url ARG_UNUSED)
 {
-  (void) url;
 }
 
 /*

@@ -29,9 +29,8 @@
 static void url_path_destroy (url_t);
 
 static void
-url_path_destroy (url_t url)
+url_path_destroy (url_t url ARG_UNUSED)
 {
-  (void)url;
 }
 
 int

@@ -39,9 +39,8 @@
 static void url_sendmail_destroy (url_t purl);
 
 static void
-url_sendmail_destroy (url_t url)
+url_sendmail_destroy (url_t url ARG_UNUSED)
 {
-  (void) url;
 }
 
 /*

@@ -20,9 +20,8 @@
 /* AUTH is not yet implemented */
 
 int
-pop3d_auth (const char *arg)
+pop3d_auth (const char *arg ARG_UNUSED)
 {
-  (void)arg;
   if (state != AUTHORIZATION)
     return ERR_WRONG_STATE;
   return ERR_NOT_IMPL;

@@ -18,11 +18,10 @@
 #include "pop3d.h"
 
 RETSIGTYPE
-pop3d_sigchld (int signo)
+pop3d_sigchld (int signo ARG_UNUSED)
 {
   pid_t pid;
   int status;
-  (void)signo;
 
   while ( (pid = waitpid(-1, &status, WNOHANG)) > 0)
       --children;