Easy bits of arg printing for list-keys.

1 files changed, 18 insertions, 18 deletions

diff --git a/cmd-swap-window.c b/cmd-swap-window.c
index 968bbc92..1b210278 100644
--- a/cmd-swap-window.c
+++ b/cmd-swap-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-swap-window.c,v 1.8 2008-06-03 16:55:09 nicm Exp $ */
+/* $Id: cmd-swap-window.c,v 1.9 2008-06-05 16:35:32 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -27,11 +27,11 @@
  * Swap one window with another.
  */
 
-int	cmd_swap_window_parse(struct cmd *, void **, int, char **, char **);
-void	cmd_swap_window_exec(void *, struct cmd_ctx *);
-void	cmd_swap_window_send(void *, struct buffer *);
-void	cmd_swap_window_recv(void **, struct buffer *);
-void	cmd_swap_window_free(void *);
+int	cmd_swap_window_parse(struct cmd *, int, char **, char **);
+void	cmd_swap_window_exec(struct cmd *, struct cmd_ctx *);
+void	cmd_swap_window_send(struct cmd *, struct buffer *);
+void	cmd_swap_window_recv(struct cmd *, struct buffer *);
+void	cmd_swap_window_free(struct cmd *);
 
 struct cmd_swap_window_data {
 	char	*cname;
@@ -51,18 +51,18 @@ const struct cmd_entry cmd_swap_window_entry = {
 	cmd_swap_window_send,
 	cmd_swap_window_recv,
 	cmd_swap_window_free,
+	NULL,
 	NULL
 };
 
 int
-cmd_swap_window_parse(
-    struct cmd *self, void **ptr, int argc, char **argv, char **cause)
+cmd_swap_window_parse(struct cmd *self, int argc, char **argv, char **cause)
 {
 	struct cmd_swap_window_data	*data;
 	const char			*errstr;
 	int				 opt;
 
-	*ptr = data = xmalloc(sizeof *data);
+	self->data = data = xmalloc(sizeof *data);
 	data->cname = NULL;
 	data->sname = NULL;
 	data->flag_detached = 0;
@@ -116,14 +116,14 @@ usage:
 	xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
 
 error:
-	cmd_swap_window_free(data);
+	self->entry->free(self);
 	return (-1);
 }
 
 void
-cmd_swap_window_exec(void *ptr, struct cmd_ctx *ctx)
+cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
-	struct cmd_swap_window_data	*data = ptr;
+	struct cmd_swap_window_data	*data = self->data;
 	struct session			*s, *src;
 	struct winlink			*srcwl, *dstwl;
 	struct window			*w;
@@ -181,9 +181,9 @@ cmd_swap_window_exec(void *ptr, struct cmd_ctx *ctx)
 }
 
 void
-cmd_swap_window_send(void *ptr, struct buffer *b)
+cmd_swap_window_send(struct cmd *self, struct buffer *b)
 {
-	struct cmd_swap_window_data	*data = ptr;
+	struct cmd_swap_window_data	*data = self->data;
 
 	buffer_write(b, data, sizeof *data);
 	cmd_send_string(b, data->cname);
@@ -192,11 +192,11 @@ cmd_swap_window_send(void *ptr, struct buffer *b)
 }
 
 void
-cmd_swap_window_recv(void **ptr, struct buffer *b)
+cmd_swap_window_recv(struct cmd *self, struct buffer *b)
 {
 	struct cmd_swap_window_data	*data;
 
-	*ptr = data = xmalloc(sizeof *data);
+	self->data = data = xmalloc(sizeof *data);
 	buffer_read(b, data, sizeof *data);
 	data->cname = cmd_recv_string(b);
 	data->sname = cmd_recv_string(b);
@@ -204,9 +204,9 @@ cmd_swap_window_recv(void **ptr, struct buffer *b)
 }
 
 void
-cmd_swap_window_free(void *ptr)
+cmd_swap_window_free(struct cmd *self)
 {
-	struct cmd_swap_window_data	*data = ptr;
+	struct cmd_swap_window_data	*data = self->data;
 
 	if (data->cname != NULL)
 		xfree(data->cname);