Sync OpenBSD patchset 567:

Remove a couple of unused arguments where possible, and add /* ARGSUSED */ to
the rest to reduce lint output.

32 files changed, 83 insertions, 43 deletions

diff --git a/cfg.c b/cfg.c
index a2076d3e..fd6d54b7 100644
--- a/cfg.c
+++ b/cfg.c
@@ -1,4 +1,4 @@
-/* $Id: cfg.c,v 1.23 2009-10-28 23:12:38 tcunha Exp $ */
+/* $Id: cfg.c,v 1.24 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -35,11 +35,13 @@ void printflike2 cfg_error(struct cmd_ctx *, const char *, ...);
 
 char	 *cfg_cause;
 
+/* ARGSUSED */
 void printflike2
 cfg_print(unused struct cmd_ctx *ctx, unused const char *fmt, ...)
 {
 }
 
+/* ARGSUSED */
 void printflike2
 cfg_error(unused struct cmd_ctx *ctx, const char *fmt, ...)
 {
diff --git a/client.c b/client.c
index 3252ccb9..ef0ebe78 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.88 2009-11-14 17:49:37 tcunha Exp $ */
+/* $Id: client.c,v 1.89 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -226,6 +226,7 @@ out:
 	exit(client_exitval);
 }
 
+/* ARGSUSED */
 void
 client_signal(int sig, unused short events, unused void *data)
 {
@@ -254,6 +255,7 @@ client_signal(int sig, unused short events, unused void *data)
 	client_update_event();
 }
 
+/* ARGSUSED */
 void
 client_callback(unused int fd, short events, unused void *data)
 {
diff --git a/cmd-copy-buffer.c b/cmd-copy-buffer.c
index 99c58a22..791c0ab3 100644
--- a/cmd-copy-buffer.c
+++ b/cmd-copy-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-copy-buffer.c,v 1.6 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-copy-buffer.c,v 1.7 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -51,6 +51,7 @@ const struct cmd_entry cmd_copy_buffer_entry = {
 	cmd_copy_buffer_print
 };
 
+/* ARGSUSED */
 void
 cmd_copy_buffer_init(struct cmd *self, unused int arg)
 {
diff --git a/cmd-generic.c b/cmd-generic.c
index 568e6c36..275bbf57 100644
--- a/cmd-generic.c
+++ b/cmd-generic.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-generic.c,v 1.36 2009-11-14 17:57:41 tcunha Exp $ */
+/* $Id: cmd-generic.c,v 1.37 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -148,6 +148,7 @@ cmd_fill_argument(int flags, char **arg, char **arg2, int argc, char **argv)
 	return (0);
 }
 
+/* ARGSUSED */
 void
 cmd_target_init(struct cmd *self, unused int key)
 {
@@ -231,6 +232,7 @@ cmd_target_print(struct cmd *self, char *buf, size_t len)
 	return (off);
 }
 
+/* ARGSUSED */
 void
 cmd_srcdst_init(struct cmd *self, unused int key)
 {
@@ -322,6 +324,7 @@ cmd_srcdst_print(struct cmd *self, char *buf, size_t len)
 	return (off);
 }
 
+/* ARGSUSED */
 void
 cmd_buffer_init(struct cmd *self, unused int key)
 {
diff --git a/cmd-kill-server.c b/cmd-kill-server.c
index 1a52ca7d..528e0eec 100644
--- a/cmd-kill-server.c
+++ b/cmd-kill-server.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-kill-server.c,v 1.10 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-kill-server.c,v 1.11 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -40,6 +40,7 @@ const struct cmd_entry cmd_kill_server_entry = {
 	NULL
 };
 
+/* ARGSUSED */
 int
 cmd_kill_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
 {
diff --git a/cmd-list-clients.c b/cmd-list-clients.c
index 744f61ff..dee1420b 100644
--- a/cmd-list-clients.c
+++ b/cmd-list-clients.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-clients.c,v 1.19 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-list-clients.c,v 1.20 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -40,6 +40,7 @@ const struct cmd_entry cmd_list_clients_entry = {
 	NULL
 };
 
+/* ARGSUSED */
 int
 cmd_list_clients_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
diff --git a/cmd-list-commands.c b/cmd-list-commands.c
index 7879cb37..a5a16791 100644
--- a/cmd-list-commands.c
+++ b/cmd-list-commands.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-commands.c,v 1.6 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-list-commands.c,v 1.7 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -37,6 +37,7 @@ const struct cmd_entry cmd_list_commands_entry = {
 	NULL
 };
 
+/* ARGSUSED */
 int
 cmd_list_commands_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
diff --git a/cmd-list-sessions.c b/cmd-list-sessions.c
index 53b08699..f6ac2438 100644
--- a/cmd-list-sessions.c
+++ b/cmd-list-sessions.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-sessions.c,v 1.24 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-list-sessions.c,v 1.25 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -39,6 +39,7 @@ const struct cmd_entry cmd_list_sessions_entry = {
 	NULL
 };
 
+/* ARGSUSED */
 int
 cmd_list_sessions_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
diff --git a/cmd-lock-server.c b/cmd-lock-server.c
index f4e590f6..14ef4ca6 100644
--- a/cmd-lock-server.c
+++ b/cmd-lock-server.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-lock-server.c,v 1.8 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-lock-server.c,v 1.9 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -41,6 +41,7 @@ const struct cmd_entry cmd_lock_server_entry = {
 	NULL,
 };
 
+/* ARGSUSED */
 int
 cmd_lock_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
 {
diff --git a/cmd-new-session.c b/cmd-new-session.c
index da9e159b..6484dc5e 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.71 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-new-session.c,v 1.72 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -52,6 +52,7 @@ const struct cmd_entry cmd_new_session_entry = {
 	cmd_new_session_print
 };
 
+/* ARGSUSED */
 void
 cmd_new_session_init(struct cmd *self, unused int arg)
 {
diff --git a/cmd-new-window.c b/cmd-new-window.c
index c8d42987..0b537021 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-window.c,v 1.40 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-new-window.c,v 1.41 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -51,6 +51,7 @@ const struct cmd_entry cmd_new_window_entry = {
 	cmd_new_window_print
 };
 
+/* ARGSUSED */
 void
 cmd_new_window_init(struct cmd *self, unused int arg)
 {
diff --git a/cmd-pipe-pane.c b/cmd-pipe-pane.c
index 2fde5038..19f3f018 100644
--- a/cmd-pipe-pane.c
+++ b/cmd-pipe-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-pipe-pane.c,v 1.8 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-pipe-pane.c,v 1.9 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -128,6 +128,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	}
 }
 
+/* ARGSUSED */
 void
 cmd_pipe_pane_error_callback(
     unused struct bufferevent *bufev, unused short what, void *data)
diff --git a/cmd-server-info.c b/cmd-server-info.c
index 6ca9a2c5..9deda7d3 100644
--- a/cmd-server-info.c
+++ b/cmd-server-info.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-server-info.c,v 1.34 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-server-info.c,v 1.35 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -43,6 +43,7 @@ const struct cmd_entry cmd_server_info_entry = {
 	NULL
 };
 
+/* ARGSUSED */
 int
 cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
diff --git a/cmd-source-file.c b/cmd-source-file.c
index b478b8ce..9c3a5641 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-source-file.c,v 1.10 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-source-file.c,v 1.11 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
@@ -45,6 +45,7 @@ const struct cmd_entry cmd_source_file_entry = {
 	cmd_source_file_print
 };
 
+/* ARGSUSED */
 void
 cmd_source_file_init(struct cmd *self, unused int arg)
 {
diff --git a/cmd-start-server.c b/cmd-start-server.c
index a5123c41..26061c9b 100644
--- a/cmd-start-server.c
+++ b/cmd-start-server.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-start-server.c,v 1.9 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-start-server.c,v 1.10 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -37,6 +37,7 @@ const struct cmd_entry cmd_start_server_entry = {
 	NULL
 };
 
+/* ARGSUSED */
 int
 cmd_start_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
 {
diff --git a/job.c b/job.c
index 606c244b..30bcb4df 100644
--- a/job.c
+++ b/job.c
@@ -1,4 +1,4 @@
-/* $Id: job.c,v 1.12 2009-11-08 22:56:54 tcunha Exp $ */
+/* $Id: job.c,v 1.13 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -191,6 +191,7 @@ job_run(struct job *job)
 }
 
 /* Job buffer error callback. */
+/* ARGSUSED */
 void
 job_callback(unused struct bufferevent *bufev, unused short events, void *data)
 {
diff --git a/names.c b/names.c
index 3734971a..002dfef6 100644
--- a/names.c
+++ b/names.c
@@ -1,4 +1,4 @@
-/* $Id: names.c,v 1.19 2009-11-08 23:23:36 tcunha Exp $ */
+/* $Id: names.c,v 1.20 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -41,6 +41,7 @@ queue_window_name(struct window *w)
 	evtimer_add(&w->name_timer, &tv);
 }
 
+/* ARGSUSED */
 void
 window_name_callback(unused int fd, unused short events, void *data)
 {
diff --git a/screen-write.c b/screen-write.c
index 6843a053..b7360059 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1,4 +1,4 @@
-/* $Id: screen-write.c,v 1.86 2009-11-19 22:23:27 tcunha Exp $ */
+/* $Id: screen-write.c,v 1.87 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -40,6 +40,7 @@ screen_write_start(
 }
 
 /* Finish writing. */
+/* ARGSUSED */
 void
 screen_write_stop(unused struct screen_write_ctx *ctx)
 {
diff --git a/server-client.c b/server-client.c
index d89be1aa..9bde7175 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $Id: server-client.c,v 1.24 2009-11-19 22:35:10 tcunha Exp $ */
+/* $Id: server-client.c,v 1.25 2009-11-28 14:50:36 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -426,6 +426,7 @@ server_client_reset_state(struct client *c)
 }
 
 /* Repeat time callback. */
+/* ARGSUSED */
 void
 server_client_repeat_timer(unused int fd, unused short events, void *data)
 {
diff --git a/server-fn.c b/server-fn.c
index 607c757f..0aac5bf4 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id: server-fn.c,v 1.97 2009-11-14 17:48:39 tcunha Exp $ */
+/* $Id: server-fn.c,v 1.98 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -396,6 +396,7 @@ server_clear_identify(struct client *c)
 	}
 }
 
+/* ARGSUSED */
 void
 server_callback_identify(unused int fd, unused short events, void *data)
 {
diff --git a/server.c b/server.c
index 79526d8a..8743453b 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.229 2009-11-14 17:48:39 tcunha Exp $ */
+/* $Id: server.c,v 1.230 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -332,6 +332,7 @@ server_update_socket(void)
 }
 
 /* Callback for server socket. */
+/* ARGSUSED */
 void
 server_accept_callback(int fd, short events, unused void *data)
 {
@@ -407,6 +408,7 @@ server_signal_clear(void)
 }
 
 /* Signal handler. */
+/* ARGSUSED */
 void
 server_signal_callback(int sig, unused short events, unused void *data)
 {
@@ -504,6 +506,7 @@ server_child_stopped(pid_t pid, int status)
 }
 
 /* Handle once-per-second timer events. */
+/* ARGSUSED */
 void
 server_second_callback(unused int fd, unused short events, unused void *arg)
 {
diff --git a/session.c b/session.c
index 5cdb1461..7d2f929f 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $Id: session.c,v 1.71 2009-11-13 16:59:19 tcunha Exp $ */
+/* $Id: session.c,v 1.72 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -318,7 +318,7 @@ session_next_activity(struct session *s, struct winlink *wl)
 			break;
 		if (session_alert_has(s, wl, WINDOW_CONTENT))
 			break;
-		wl = winlink_next(&s->windows, wl);
+		wl = winlink_next(wl);
 	}
 	return (wl);
 }
@@ -332,7 +332,7 @@ session_next(struct session *s, int activity)
 	if (s->curw == NULL)
 		return (-1);
 
-	wl = winlink_next(&s->windows, s->curw);
+	wl = winlink_next(s->curw);
 	if (activity)
 		wl = session_next_activity(s, wl);
 	if (wl == NULL) {
@@ -359,7 +359,7 @@ session_previous_activity(struct session *s, struct winlink *wl)
 			break;
 		if (session_alert_has(s, wl, WINDOW_CONTENT))
 			break;
-		wl = winlink_previous(&s->windows, wl);
+		wl = winlink_previous(wl);
 	}
 	return (wl);
 }
@@ -373,7 +373,7 @@ session_previous(struct session *s, int activity)
 	if (s->curw == NULL)
 		return (-1);
 
-	wl = winlink_previous(&s->windows, s->curw);
+	wl = winlink_previous(s->curw);
 	if (activity)
 		wl = session_previous_activity(s, wl);
 	if (wl == NULL) {
diff --git a/status.c b/status.c
index bece675b..fe8aa608 100644
--- a/status.c
+++ b/status.c
@@ -1,4 +1,4 @@
-/* $Id: status.c,v 1.136 2009-11-22 00:11:33 tcunha Exp $ */
+/* $Id: status.c,v 1.137 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -688,6 +688,7 @@ status_message_clear(struct client *c)
 }
 
 /* Clear status line message after timer expires. */
+/* ARGSUSED */
 void
 status_message_callback(unused int fd, unused short event, void *data)
 {
diff --git a/tmux.c b/tmux.c
index 84a253cb..ae58f676 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.191 2009-11-19 22:35:10 tcunha Exp $ */
+/* $Id: tmux.c,v 1.192 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -571,6 +571,7 @@ main_clear_signals(void)
 	event_del(&main_ev_sigterm);
 }
 
+/* ARGSUSED */
 void
 main_signal(int sig, unused short events, unused void *data)
 {
@@ -580,6 +581,7 @@ main_signal(int sig, unused short events, unused void *data)
 	}
 }
 
+/* ARGSUSED */
 void
 main_callback(unused int fd, short events, void *data)
 {
diff --git a/tmux.h b/tmux.h
index 12a1265b..45dbabc8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.523 2009-11-28 14:41:17 tcunha Exp $ */
+/* $Id: tmux.h,v 1.524 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1789,8 +1789,8 @@ int		 winlink_next_index(struct winlinks *, int);
 u_int		 winlink_count(struct winlinks *);
 struct winlink	*winlink_add(struct winlinks *, struct window *, int);
 void		 winlink_remove(struct winlinks *, struct winlink *);
-struct winlink	*winlink_next(struct winlinks *, struct winlink *);
-struct winlink	*winlink_previous(struct winlinks *, struct winlink *);
+struct winlink	*winlink_next(struct winlink *);
+struct winlink	*winlink_previous(struct winlink *);
 void		 winlink_stack_push(struct winlink_stack *, struct winlink *);
 void		 winlink_stack_remove(struct winlink_stack *, struct winlink *);
 int	 	 window_index(struct window *, u_int *);
diff --git a/tty-keys.c b/tty-keys.c
index 26504090..3e487db7 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -1,4 +1,4 @@
-/* $Id: tty-keys.c,v 1.48 2009-11-28 14:44:00 tcunha Exp $ */
+/* $Id: tty-keys.c,v 1.49 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -555,6 +555,7 @@ handle_key:
 }
 
 /* Key timer callback. */
+/* ARGSUSED */
 void
 tty_keys_callback(unused int fd, unused short events, void *data)
 {
diff --git a/tty.c b/tty.c
index 7ae8d86c..ab35f9bf 100644
--- a/tty.c
+++ b/tty.c
@@ -1,4 +1,4 @@
-/* $Id: tty.c,v 1.176 2009-11-28 14:42:21 tcunha Exp $ */
+/* $Id: tty.c,v 1.177 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -38,7 +38,7 @@ int	tty_try_88(struct tty *, u_char, const char *);
 
 void	tty_colours(struct tty *, const struct grid_cell *, int *);
 void	tty_colours_fg(struct tty *, const struct grid_cell *, int *);
-void	tty_colours_bg(struct tty *, const struct grid_cell *, int *);
+void	tty_colours_bg(struct tty *, const struct grid_cell *);
 
 void	tty_redraw_region(struct tty *, const struct tty_ctx *);
 void	tty_emulate_repeat(
@@ -125,6 +125,7 @@ tty_open(struct tty *tty, const char *overrides, char **cause)
 	return (0);
 }
 
+/* ARGSUSED */
 void
 tty_read_callback(unused struct bufferevent *bufev, void *data)
 {
@@ -134,6 +135,7 @@ tty_read_callback(unused struct bufferevent *bufev, void *data)
 		;
 }
 
+/* ARGSUSED */
 void
 tty_error_callback(
     unused struct bufferevent *bufev, unused short what, unused void *data)
@@ -1283,7 +1285,7 @@ tty_colours(struct tty *tty, const struct grid_cell *gc, int *attr)
 	 */
 	if (!bg_default && (bg != tc->bg ||
 	    ((flags & GRID_FLAG_BG256) != (tc->flags & GRID_FLAG_BG256))))
-		tty_colours_bg(tty, gc, attr);
+		tty_colours_bg(tty, gc);
 }
 
 void
@@ -1320,7 +1322,7 @@ save_fg:
 }
 
 void
-tty_colours_bg(struct tty *tty, const struct grid_cell *gc, unused int *attr)
+tty_colours_bg(struct tty *tty, const struct grid_cell *gc)
 {
 	struct grid_cell	*tc = &tty->cell;
 	u_char			 bg = gc->bg;
diff --git a/window-choose.c b/window-choose.c
index 274044ae..6dac57d1 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -1,4 +1,4 @@
-/* $Id: window-choose.c,v 1.25 2009-11-18 01:27:33 tcunha Exp $ */
+/* $Id: window-choose.c,v 1.26 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -169,6 +169,7 @@ window_choose_resize(struct window_pane *wp, u_int sx, u_int sy)
 	window_choose_redraw_screen(wp);
 }
 
+/* ARGSUSED */
 void
 window_choose_key(struct window_pane *wp, unused struct client *c, int key)
 {
@@ -275,6 +276,7 @@ window_choose_key(struct window_pane *wp, unused struct client *c, int key)
 	}
 }
 
+/* ARGSUSED */
 void
 window_choose_mouse(
     struct window_pane *wp, unused struct client *c, struct mouse_event *m)
diff --git a/window-clock.c b/window-clock.c
index 49676450..cb1d78af 100644
--- a/window-clock.c
+++ b/window-clock.c
@@ -1,4 +1,4 @@
-/* $Id: window-clock.c,v 1.8 2009-07-01 19:03:33 nicm Exp $ */
+/* $Id: window-clock.c,v 1.9 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -82,6 +82,7 @@ window_clock_resize(struct window_pane *wp, u_int sx, u_int sy)
 	window_clock_draw_screen(wp);
 }
 
+/* ARGSUSED */
 void
 window_clock_key(
     struct window_pane *wp, unused struct client *c, unused int key)
diff --git a/window-copy.c b/window-copy.c
index f6375017..340825bd 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1,4 +1,4 @@
-/* $Id: window-copy.c,v 1.92 2009-11-19 22:24:17 tcunha Exp $ */
+/* $Id: window-copy.c,v 1.93 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -435,6 +435,7 @@ window_copy_key_input(struct window_pane *wp, int key)
 	return (0);
 }
 
+/* ARGSUSED */
 void
 window_copy_mouse(
     struct window_pane *wp, unused struct client *c, struct mouse_event *m)
diff --git a/window-more.c b/window-more.c
index d9b3a728..e2708e89 100644
--- a/window-more.c
+++ b/window-more.c
@@ -1,4 +1,4 @@
-/* $Id: window-more.c,v 1.38 2009-09-11 14:13:52 tcunha Exp $ */
+/* $Id: window-more.c,v 1.39 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -123,6 +123,7 @@ window_more_resize(struct window_pane *wp, u_int sx, u_int sy)
 	window_more_redraw_screen(wp);
 }
 
+/* ARGSUSED */
 void
 window_more_key(struct window_pane *wp, unused struct client *c, int key)
 {
diff --git a/window.c b/window.c
index beee28ef..216db181 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.123 2009-11-19 22:37:04 tcunha Exp $ */
+/* $Id: window.c,v 1.124 2009-11-28 14:50:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -159,13 +159,13 @@ winlink_remove(struct winlinks *wwl, struct winlink *wl)
 }
 
 struct winlink *
-winlink_next(unused struct winlinks *wwl, struct winlink *wl)
+winlink_next(struct winlink *wl)
 {
 	return (RB_NEXT(winlinks, wwl, wl));
 }
 
 struct winlink *
-winlink_previous(unused struct winlinks *wwl, struct winlink *wl)
+winlink_previous(struct winlink *wl)
 {
 	return (RB_PREV(winlinks, wwl, wl));
 }
@@ -580,6 +580,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
 	return (0);
 }
 
+/* ARGSUSED */
 void
 window_pane_read_callback(unused struct bufferevent *bufev, void *data)
 {
@@ -588,6 +589,7 @@ window_pane_read_callback(unused struct bufferevent *bufev, void *data)
 	window_pane_parse(wp);
 }
 
+/* ARGSUSED */
 void
 window_pane_error_callback(
     unused struct bufferevent *bufev, unused short what, void *data)