From d45c12b6c9405da549197c2852ac124fc0d5b340 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 10 Oct 2013 12:00:18 +0000
Subject: Remove the barely-used and unnecessary command check() function.

---
 cmd-unbind-key.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'cmd-unbind-key.c')

diff --git a/cmd-unbind-key.c b/cmd-unbind-key.c
index 88c81270..b89340da 100644
--- a/cmd-unbind-key.c
+++ b/cmd-unbind-key.c
@@ -26,7 +26,6 @@
  * Unbind key from command.
  */
 
-enum cmd_retval	 cmd_unbind_key_check(struct args *);
 enum cmd_retval	 cmd_unbind_key_exec(struct cmd *, struct cmd_q *);
 enum cmd_retval	 cmd_unbind_key_table(struct cmd *, struct cmd_q *, int);
 
@@ -36,20 +35,9 @@ const struct cmd_entry cmd_unbind_key_entry = {
 	"[-acn] [-t key-table] key",
 	0,
 	NULL,
-	cmd_unbind_key_check,
 	cmd_unbind_key_exec
 };
 
-enum cmd_retval
-cmd_unbind_key_check(struct args *args)
-{
-	if (args_has(args, 'a') && args->argc != 0)
-		return (CMD_RETURN_ERROR);
-	if (!args_has(args, 'a') && args->argc != 1)
-		return (CMD_RETURN_ERROR);
-	return (CMD_RETURN_NORMAL);
-}
-
 enum cmd_retval
 cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
 {
@@ -58,13 +46,23 @@ cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
 	int			 key;
 
 	if (!args_has(args, 'a')) {
+		if (args->argc != 1) {
+			cmdq_error(cmdq, "missing key");
+			return (CMD_RETURN_ERROR);
+		}
+		return (CMD_RETURN_ERROR);
 		key = key_string_lookup_string(args->argv[0]);
 		if (key == KEYC_NONE) {
 			cmdq_error(cmdq, "unknown key: %s", args->argv[0]);
 			return (CMD_RETURN_ERROR);
 		}
-	} else
+	} else {
+		if (args->argc != 0) {
+			cmdq_error(cmdq, "key given with -a");
+			return (CMD_RETURN_ERROR);
+		}
 		key = KEYC_NONE;
+	}
 
 	if (args_has(args, 't'))
 		return (cmd_unbind_key_table(self, cmdq, key));
-- 
cgit v1.2.3


From ffba21a60c26eefe5e4cb67dd290514fa3b5af17 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 11 Oct 2013 08:06:03 +0000
Subject: Remove stray return, from Chris Johnsen.

---
 cmd-unbind-key.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'cmd-unbind-key.c')

diff --git a/cmd-unbind-key.c b/cmd-unbind-key.c
index b89340da..5d86665b 100644
--- a/cmd-unbind-key.c
+++ b/cmd-unbind-key.c
@@ -50,7 +50,6 @@ cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
 			cmdq_error(cmdq, "missing key");
 			return (CMD_RETURN_ERROR);
 		}
-		return (CMD_RETURN_ERROR);
 		key = key_string_lookup_string(args->argv[0]);
 		if (key == KEYC_NONE) {
 			cmdq_error(cmdq, "unknown key: %s", args->argv[0]);
-- 
cgit v1.2.3