diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2016-10-16 19:04:06 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2016-10-16 19:04:06 +0000 |
| commit | 3f0dad54b9b7fbe7e951cb592fa147fbdc7bdde6 (patch) | |
| tree | a685fa2872c014d3bc9be168c7338d3974fcab39 /usr.bin/tmux/cmd-pipe-pane.c | |
| parent | f71299d662dee69becff6a71ecf049a77fbacd95 (diff) | |
Mass rename struct cmd_q to struct cmdq_item and related.
Diffstat (limited to 'usr.bin/tmux/cmd-pipe-pane.c')
| -rw-r--r-- | usr.bin/tmux/cmd-pipe-pane.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/tmux/cmd-pipe-pane.c b/usr.bin/tmux/cmd-pipe-pane.c index 505a9bec97e..761a931558c 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.38 2016/10/14 22:14:22 nicm Exp $ */ +/* $OpenBSD: cmd-pipe-pane.c,v 1.39 2016/10/16 19:04:05 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -33,7 +33,7 @@ * Open pipe to redirect pane output. If already open, close first. */ -static enum cmd_retval cmd_pipe_pane_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_pipe_pane_exec(struct cmd *, struct cmdq_item *); static void cmd_pipe_pane_error_callback(struct bufferevent *, short, void *); @@ -51,13 +51,13 @@ const struct cmd_entry cmd_pipe_pane_entry = { }; static enum cmd_retval -cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; - struct client *c = cmdq->state.c; - struct window_pane *wp = cmdq->state.tflag.wp; - struct session *s = cmdq->state.tflag.s; - struct winlink *wl = cmdq->state.tflag.wl; + struct client *c = item->state.c; + struct window_pane *wp = item->state.tflag.wp; + struct session *s = item->state.tflag.s; + struct winlink *wl = item->state.tflag.wl; char *cmd; int old_fd, pipe_fd[2], null_fd; struct format_tree *ft; @@ -85,12 +85,12 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq) /* Open the new pipe. */ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_fd) != 0) { - cmdq_error(cmdq, "socketpair error: %s", strerror(errno)); + cmdq_error(item, "socketpair error: %s", strerror(errno)); return (CMD_RETURN_ERROR); } /* Expand the command. */ - ft = format_create(cmdq, 0); + ft = format_create(item, 0); format_defaults(ft, c, s, wl, wp); cmd = format_expand_time(ft, args->argv[0], time(NULL)); format_free(ft); @@ -98,7 +98,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq) /* Fork the child. */ switch (fork()) { case -1: - cmdq_error(cmdq, "fork error: %s", strerror(errno)); + cmdq_error(item, "fork error: %s", strerror(errno)); free(cmd); return (CMD_RETURN_ERROR); |