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/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c
index f842a82868f..934838b33c8 100644
--- a/usr.bin/tmux/cfg.c
+++ b/usr.bin/tmux/cfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfg.c,v 1.7 2009/10/26 21:42:04 deraadt Exp $ */
+/* $OpenBSD: cfg.c,v 1.8 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/client.c b/usr.bin/tmux/client.c
index e7f516c4243..80f7a3fe511 100644
--- a/usr.bin/tmux/client.c
+++ b/usr.bin/tmux/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.33 2009/11/13 18:07:52 nicm Exp $ */
+/* $OpenBSD: client.c,v 1.34 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -222,6 +222,7 @@ out:
 	exit(client_exitval);
 }
 
+/* ARGSUSED */
 void
 client_signal(int sig, unused short events, unused void *data)
 {
@@ -250,6 +251,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/usr.bin/tmux/cmd-copy-buffer.c b/usr.bin/tmux/cmd-copy-buffer.c
index 238a2cc2c8e..944cfa49123 100644
--- a/usr.bin/tmux/cmd-copy-buffer.c
+++ b/usr.bin/tmux/cmd-copy-buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-copy-buffer.c,v 1.6 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-copy-buffer.c,v 1.7 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-generic.c b/usr.bin/tmux/cmd-generic.c
index 38002622e80..d51329d9edf 100644
--- a/usr.bin/tmux/cmd-generic.c
+++ b/usr.bin/tmux/cmd-generic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-generic.c,v 1.9 2009/11/13 19:58:32 nicm Exp $ */
+/* $OpenBSD: cmd-generic.c,v 1.10 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-kill-server.c b/usr.bin/tmux/cmd-kill-server.c
index 496fb09a488..7c95a0bc88d 100644
--- a/usr.bin/tmux/cmd-kill-server.c
+++ b/usr.bin/tmux/cmd-kill-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-kill-server.c,v 1.5 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-kill-server.c,v 1.6 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-list-clients.c b/usr.bin/tmux/cmd-list-clients.c
index cc3dc193b8b..9ce3265b1ae 100644
--- a/usr.bin/tmux/cmd-list-clients.c
+++ b/usr.bin/tmux/cmd-list-clients.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-clients.c,v 1.4 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-list-clients.c,v 1.5 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-list-commands.c b/usr.bin/tmux/cmd-list-commands.c
index 374b00b24b3..5a1aa8a5382 100644
--- a/usr.bin/tmux/cmd-list-commands.c
+++ b/usr.bin/tmux/cmd-list-commands.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-commands.c,v 1.4 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-list-commands.c,v 1.5 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-list-sessions.c b/usr.bin/tmux/cmd-list-sessions.c
index 4436972337f..bb1586821f1 100644
--- a/usr.bin/tmux/cmd-list-sessions.c
+++ b/usr.bin/tmux/cmd-list-sessions.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-sessions.c,v 1.6 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-list-sessions.c,v 1.7 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-lock-server.c b/usr.bin/tmux/cmd-lock-server.c
index 04e798b9bad..cdc55bc2a4f 100644
--- a/usr.bin/tmux/cmd-lock-server.c
+++ b/usr.bin/tmux/cmd-lock-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-lock-server.c,v 1.6 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-lock-server.c,v 1.7 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c
index be47043785e..823cc30adc5 100644
--- a/usr.bin/tmux/cmd-new-session.c
+++ b/usr.bin/tmux/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-session.c,v 1.23 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-new-session.c,v 1.24 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-new-window.c b/usr.bin/tmux/cmd-new-window.c
index 10b1a603933..f231ec1066c 100644
--- a/usr.bin/tmux/cmd-new-window.c
+++ b/usr.bin/tmux/cmd-new-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-window.c,v 1.9 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-new-window.c,v 1.10 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-pipe-pane.c b/usr.bin/tmux/cmd-pipe-pane.c
index aea7c504cf0..bcde2eb66a7 100644
--- a/usr.bin/tmux/cmd-pipe-pane.c
+++ b/usr.bin/tmux/cmd-pipe-pane.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-pipe-pane.c,v 1.7 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-pipe-pane.c,v 1.8 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -129,6 +129,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/usr.bin/tmux/cmd-server-info.c b/usr.bin/tmux/cmd-server-info.c
index bccbc39b953..d16d911d3d9 100644
--- a/usr.bin/tmux/cmd-server-info.c
+++ b/usr.bin/tmux/cmd-server-info.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-server-info.c,v 1.15 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-server-info.c,v 1.16 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -44,6 +44,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/usr.bin/tmux/cmd-source-file.c b/usr.bin/tmux/cmd-source-file.c
index 801f25ca78e..15ceb3752f2 100644
--- a/usr.bin/tmux/cmd-source-file.c
+++ b/usr.bin/tmux/cmd-source-file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-source-file.c,v 1.6 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-source-file.c,v 1.7 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/cmd-start-server.c b/usr.bin/tmux/cmd-start-server.c
index 8d2b3c6abbb..c2a009f919d 100644
--- a/usr.bin/tmux/cmd-start-server.c
+++ b/usr.bin/tmux/cmd-start-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-start-server.c,v 1.4 2009/11/13 19:53:29 nicm Exp $ */
+/* $OpenBSD: cmd-start-server.c,v 1.5 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/job.c b/usr.bin/tmux/job.c
index cc8bb2b56bc..30da9120822 100644
--- a/usr.bin/tmux/job.c
+++ b/usr.bin/tmux/job.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: job.c,v 1.12 2009/11/04 21:10:49 nicm Exp $ */
+/* $OpenBSD: job.c,v 1.13 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -192,6 +192,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/usr.bin/tmux/names.c b/usr.bin/tmux/names.c
index edc2f86f1d5..858ba919399 100644
--- a/usr.bin/tmux/names.c
+++ b/usr.bin/tmux/names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: names.c,v 1.9 2009/11/04 23:54:57 nicm Exp $ */
+/* $OpenBSD: names.c,v 1.10 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index 773ea337530..bf22315aba5 100644
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.39 2009/11/18 17:02:17 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.40 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index f649091efa8..88f06907fc9 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.23 2009/11/19 16:22:10 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.24 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -427,6 +427,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/usr.bin/tmux/server-fn.c b/usr.bin/tmux/server-fn.c
index dbe83cbefe1..6a377583c81 100644
--- a/usr.bin/tmux/server-fn.c
+++ b/usr.bin/tmux/server-fn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.29 2009/11/13 17:33:07 nicm Exp $ */
+/* $OpenBSD: server-fn.c,v 1.30 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index c01d54603d0..859fac460e6 100644
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.77 2009/11/13 17:33:07 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.78 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -314,6 +314,7 @@ server_update_socket(void)
 }
 
 /* Callback for server socket. */
+/* ARGSUSED */
 void
 server_accept_callback(int fd, short events, unused void *data)
 {
@@ -389,6 +390,7 @@ server_signal_clear(void)
 }
 
 /* Signal handler. */
+/* ARGSUSED */
 void
 server_signal_callback(int sig, unused short events, unused void *data)
 {
@@ -486,6 +488,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/usr.bin/tmux/session.c b/usr.bin/tmux/session.c
index d160182bce1..4f243684854 100644
--- a/usr.bin/tmux/session.c
+++ b/usr.bin/tmux/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.13 2009/11/13 14:47:31 nicm Exp $ */
+/* $OpenBSD: session.c,v 1.14 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -319,7 +319,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);
 }
@@ -333,7 +333,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) {
@@ -360,7 +360,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);
 }
@@ -374,7 +374,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/usr.bin/tmux/status.c b/usr.bin/tmux/status.c
index 3057594b3bc..6b979a054f5 100644
--- a/usr.bin/tmux/status.c
+++ b/usr.bin/tmux/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.51 2009/11/20 07:01:12 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.52 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 0813b895d83..43288117c00 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.60 2009/11/19 16:22:10 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.61 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -554,6 +554,7 @@ main_clear_signals(void)
 	event_del(&main_ev_sigterm);
 }
 
+/* ARGSUSED */
 void
 main_signal(int sig, unused short events, unused void *data)
 {
@@ -563,6 +564,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/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index e76dc267103..4b50a84fb02 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.185 2009/11/25 12:24:31 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.186 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1790,8 +1790,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/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c
index 9a54da99a59..cdbcb7d9587 100644
--- a/usr.bin/tmux/tty-keys.c
+++ b/usr.bin/tmux/tty-keys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-keys.c,v 1.22 2009/11/26 15:14:03 nicm Exp $ */
+/* $OpenBSD: tty-keys.c,v 1.23 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index d4feadac19b..8c49ce394a4 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.72 2009/11/26 14:46:08 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.73 2009/11/26 21:37:13 nicm 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)
@@ -1278,7 +1280,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
@@ -1315,7 +1317,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/usr.bin/tmux/window-choose.c b/usr.bin/tmux/window-choose.c
index d24283ddc60..cf4bf31c528 100644
--- a/usr.bin/tmux/window-choose.c
+++ b/usr.bin/tmux/window-choose.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-choose.c,v 1.11 2009/11/17 13:06:11 nicm Exp $ */
+/* $OpenBSD: window-choose.c,v 1.12 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/window-clock.c b/usr.bin/tmux/window-clock.c
index 8a68dd3778b..44bcc5c4549 100644
--- a/usr.bin/tmux/window-clock.c
+++ b/usr.bin/tmux/window-clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-clock.c,v 1.2 2009/06/27 14:40:22 nicm Exp $ */
+/* $OpenBSD: window-clock.c,v 1.3 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c
index f6cc071aead..3817db9a12d 100644
--- a/usr.bin/tmux/window-copy.c
+++ b/usr.bin/tmux/window-copy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.33 2009/11/18 17:03:16 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.34 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/window-more.c b/usr.bin/tmux/window-more.c
index 3581658e902..42055a11004 100644
--- a/usr.bin/tmux/window-more.c
+++ b/usr.bin/tmux/window-more.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-more.c,v 1.9 2009/09/10 17:16:24 nicm Exp $ */
+/* $OpenBSD: window-more.c,v 1.10 2009/11/26 21:37:13 nicm 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/usr.bin/tmux/window.c b/usr.bin/tmux/window.c
index b41b6a72a42..5eaf9b1ac14 100644
--- a/usr.bin/tmux/window.c
+++ b/usr.bin/tmux/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.40 2009/11/19 19:47:28 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.41 2009/11/26 21:37:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -161,13 +161,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));
 }
@@ -582,6 +582,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)
 {
@@ -590,6 +591,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)