===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- src/usr.bin/tmux/cmd.c	2015/12/14 00:31:54	1.118
+++ src/usr.bin/tmux/cmd.c	2015/12/14 23:30:58	1.119
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.118 2015/12/14 00:31:54 nicm Exp $ */
+/* $OpenBSD: cmd.c,v 1.119 2015/12/14 23:30:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -388,22 +388,6 @@
 	return (NULL);
 }
 
-static void
-cmd_clear_state(struct cmd_state *state)
-{
-	state->c = NULL;
-
-	state->tflag.s = NULL;
-	state->tflag.wl = NULL;
-	state->tflag.wp = NULL;
-	state->tflag.idx = -1;
-
-	state->sflag.s = NULL;
-	state->sflag.wl = NULL;
-	state->sflag.wp = NULL;
-	state->sflag.idx = -1;
-}
-
 static int
 cmd_prepare_state_flag(struct cmd_find_state *fs, enum cmd_entry_flag flag,
     const char *target, struct cmd_q *cmdq)
@@ -493,7 +477,9 @@
 	log_debug("preparing state for %s (client %p)", tmp, cmdq->client);
 	free(tmp);
 
-	cmd_clear_state(state);
+	state->c = NULL;
+	cmd_find_clear_state(&state->tflag, NULL, 0);
+	cmd_find_clear_state(&state->sflag, NULL, 0);
 
 	flag = cmd->entry->cflag;
 	if (flag == CMD_NONE) {