From d5999f8b5cbbd3648d7a6c00100e5eab279a90bb Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 14 Dec 2015 23:30:58 +0000
Subject: Use cmd_find_clear_state instead of an extra function doing the same.

---
 cmd.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'cmd.c')

diff --git a/cmd.c b/cmd.c
index 62be3af1..4f1e1b90 100644
--- a/cmd.c
+++ b/cmd.c
@@ -388,22 +388,6 @@ usage:
 	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 @@ cmd_prepare_state(struct cmd *cmd, struct cmd_q *cmdq)
 	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) {
-- 
cgit