Get rid of the extra layer of flags and cmd_prepare() and just store the

CMD_FIND_* flags in the cmd_entry and call it for the command. Commands
with special requirements call it themselves and update the target for
hooks to use.

1 files changed, 4 insertions, 4 deletions

diff --git a/cmd-find-window.c b/cmd-find-window.c
index 0392688a..06cdd946 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -54,7 +54,7 @@ const struct cmd_entry cmd_find_window_entry = {
 	.args = { "F:CNt:T", 1, 4 },
 	.usage = "[-CNT] [-F format] " CMD_TARGET_WINDOW_USAGE " match-string",
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_find_window_exec
@@ -143,10 +143,10 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
 	struct cmd_find_state		*current = &item->shared->current;
-	struct client			*c = item->state.c;
+	struct client			*c = cmd_find_client(item, NULL, 1);
 	struct window_choose_data	*cdata;
-	struct session			*s = item->state.tflag.s;
-	struct winlink			*wl = item->state.tflag.wl, *wm;
+	struct session			*s = item->target.s;
+	struct winlink			*wl = item->target.wl, *wm;
 	struct cmd_find_window_list	 find_list;
 	struct cmd_find_window_data	*find_data;
 	struct cmd_find_window_data	*find_data1;