summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/cmd-find-window.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/tmux/cmd-find-window.c')
-rw-r--r--usr.bin/tmux/cmd-find-window.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/tmux/cmd-find-window.c b/usr.bin/tmux/cmd-find-window.c
index 05cc3015d95..8be8d6a43df 100644
--- a/usr.bin/tmux/cmd-find-window.c
+++ b/usr.bin/tmux/cmd-find-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-find-window.c,v 1.38 2016/10/10 21:51:39 nicm Exp $ */
+/* $OpenBSD: cmd-find-window.c,v 1.39 2016/10/16 19:04:05 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -33,9 +33,9 @@
"[#{window_width}x#{window_height}] " \
"(#{window_panes} panes) #{window_find_matches}"
-static enum cmd_retval cmd_find_window_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval cmd_find_window_exec(struct cmd *, struct cmdq_item *);
-static void cmd_find_window_callback(struct window_choose_data *);
+static void cmd_find_window_callback(struct window_choose_data *);
/* Flags for determining matching behavior. */
#define CMD_FIND_WINDOW_BY_TITLE 0x1
@@ -139,13 +139,13 @@ cmd_find_window_match(struct cmd_find_window_list *find_list,
}
static enum cmd_retval
-cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
- struct client *c = cmdq->state.c;
+ struct client *c = item->state.c;
struct window_choose_data *cdata;
- struct session *s = cmdq->state.tflag.s;
- struct winlink *wl = cmdq->state.tflag.wl, *wm;
+ struct session *s = item->state.tflag.s;
+ struct winlink *wl = item->state.tflag.wl, *wm;
struct cmd_find_window_list find_list;
struct cmd_find_window_data *find_data;
struct cmd_find_window_data *find_data1;
@@ -154,7 +154,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
u_int i, match_flags;
if (c == NULL) {
- cmdq_error(cmdq, "no client available");
+ cmdq_error(item, "no client available");
return (CMD_RETURN_ERROR);
}
@@ -172,7 +172,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
free(searchstr);
if (TAILQ_EMPTY(&find_list)) {
- cmdq_error(cmdq, "no windows matching: %s", str);
+ cmdq_error(item, "no windows matching: %s", str);
return (CMD_RETURN_ERROR);
}