diff options
Diffstat (limited to 'cmd-rename-window.c')
| -rw-r--r-- | cmd-rename-window.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/cmd-rename-window.c b/cmd-rename-window.c index 5bb4db5a..7bc26d20 100644 --- a/cmd-rename-window.c +++ b/cmd-rename-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-rename-window.c,v 1.19 2008-06-04 17:54:26 nicm Exp $ */ +/* $Id: cmd-rename-window.c,v 1.20 2008-06-05 16:35:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -27,11 +27,11 @@ * Rename window by index. */ -int cmd_rename_window_parse(struct cmd *, void **, int, char **, char **); -void cmd_rename_window_exec(void *, struct cmd_ctx *); -void cmd_rename_window_send(void *, struct buffer *); -void cmd_rename_window_recv(void **, struct buffer *); -void cmd_rename_window_free(void *); +int cmd_rename_window_parse(struct cmd *, int, char **, char **); +void cmd_rename_window_exec(struct cmd *, struct cmd_ctx *); +void cmd_rename_window_send(struct cmd *, struct buffer *); +void cmd_rename_window_recv(struct cmd *, struct buffer *); +void cmd_rename_window_free(struct cmd *); struct cmd_rename_window_data { char *cname; @@ -49,18 +49,18 @@ const struct cmd_entry cmd_rename_window_entry = { cmd_rename_window_send, cmd_rename_window_recv, cmd_rename_window_free, + NULL, NULL }; int -cmd_rename_window_parse( - struct cmd *self, void **ptr, int argc, char **argv, char **cause) +cmd_rename_window_parse(struct cmd *self, int argc, char **argv, char **cause) { struct cmd_rename_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->idx = -1; @@ -104,14 +104,14 @@ usage: xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage); error: - cmd_rename_window_free(data); + self->entry->free(self); return (-1); } void -cmd_rename_window_exec(void *ptr, struct cmd_ctx *ctx) +cmd_rename_window_exec(struct cmd *self, struct cmd_ctx *ctx) { - struct cmd_rename_window_data *data = ptr; + struct cmd_rename_window_data *data = self->data; struct session *s; struct winlink *wl; @@ -132,9 +132,9 @@ cmd_rename_window_exec(void *ptr, struct cmd_ctx *ctx) } void -cmd_rename_window_send(void *ptr, struct buffer *b) +cmd_rename_window_send(struct cmd *self, struct buffer *b) { - struct cmd_rename_window_data *data = ptr; + struct cmd_rename_window_data *data = self->data; buffer_write(b, data, sizeof *data); cmd_send_string(b, data->cname); @@ -143,11 +143,11 @@ cmd_rename_window_send(void *ptr, struct buffer *b) } void -cmd_rename_window_recv(void **ptr, struct buffer *b) +cmd_rename_window_recv(struct cmd *self, struct buffer *b) { struct cmd_rename_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); @@ -155,9 +155,9 @@ cmd_rename_window_recv(void **ptr, struct buffer *b) } void -cmd_rename_window_free(void *ptr) +cmd_rename_window_free(struct cmd *self) { - struct cmd_rename_window_data *data = ptr; + struct cmd_rename_window_data *data = self->data; if (data->cname != NULL) xfree(data->cname); |