diff options
-rw-r--r-- | include/sway/commands.h | 1 | ||||
-rw-r--r-- | sway/commands.c | 8 | ||||
-rw-r--r-- | sway/commands/bar/bindsym.c | 2 | ||||
-rw-r--r-- | sway/commands/bind.c | 2 | ||||
-rw-r--r-- | sway/commands/exec_always.c | 4 | ||||
-rw-r--r-- | sway/commands/layout.c | 2 |
6 files changed, 5 insertions, 14 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 2f6d31b1..791b37dc 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -39,7 +39,6 @@ struct cmd_results { | |||
39 | }; | 39 | }; |
40 | 40 | ||
41 | enum expected_args { | 41 | enum expected_args { |
42 | EXPECTED_MORE_THAN, | ||
43 | EXPECTED_AT_LEAST, | 42 | EXPECTED_AT_LEAST, |
44 | EXPECTED_LESS_THAN, | 43 | EXPECTED_LESS_THAN, |
45 | EXPECTED_EQUAL_TO | 44 | EXPECTED_EQUAL_TO |
diff --git a/sway/commands.c b/sway/commands.c index 3f416afc..4c1b34d5 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -20,14 +20,6 @@ | |||
20 | struct cmd_results *checkarg(int argc, const char *name, enum expected_args type, int val) { | 20 | struct cmd_results *checkarg(int argc, const char *name, enum expected_args type, int val) { |
21 | struct cmd_results *error = NULL; | 21 | struct cmd_results *error = NULL; |
22 | switch (type) { | 22 | switch (type) { |
23 | case EXPECTED_MORE_THAN: | ||
24 | if (argc > val) { | ||
25 | return NULL; | ||
26 | } | ||
27 | error = cmd_results_new(CMD_INVALID, name, "Invalid %s command " | ||
28 | "(expected more than %d argument%s, got %d)", | ||
29 | name, val, (char*[2]){"s", ""}[argc==1], argc); | ||
30 | break; | ||
31 | case EXPECTED_AT_LEAST: | 23 | case EXPECTED_AT_LEAST: |
32 | if (argc >= val) { | 24 | if (argc >= val) { |
33 | return NULL; | 25 | return NULL; |
diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c index 4eea3e6a..965c8903 100644 --- a/sway/commands/bar/bindsym.c +++ b/sway/commands/bar/bindsym.c | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | struct cmd_results *bar_cmd_bindsym(int argc, char **argv) { | 11 | struct cmd_results *bar_cmd_bindsym(int argc, char **argv) { |
12 | struct cmd_results *error = NULL; | 12 | struct cmd_results *error = NULL; |
13 | if ((error = checkarg(argc, "bar bindsym", EXPECTED_MORE_THAN, 1))) { | 13 | if ((error = checkarg(argc, "bar bindsym", EXPECTED_AT_LEAST, 2))) { |
14 | return error; | 14 | return error; |
15 | } | 15 | } |
16 | if (!config->current_bar) { | 16 | if (!config->current_bar) { |
diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 5832d01e..a9de227f 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c | |||
@@ -145,7 +145,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv, | |||
145 | const char *bindtype = bindcode ? "bindcode" : "bindsym"; | 145 | const char *bindtype = bindcode ? "bindcode" : "bindsym"; |
146 | 146 | ||
147 | struct cmd_results *error = NULL; | 147 | struct cmd_results *error = NULL; |
148 | if ((error = checkarg(argc, bindtype, EXPECTED_MORE_THAN, 1))) { | 148 | if ((error = checkarg(argc, bindtype, EXPECTED_AT_LEAST, 2))) { |
149 | return error; | 149 | return error; |
150 | } | 150 | } |
151 | 151 | ||
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 43b35dd7..8bdeceeb 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c | |||
@@ -16,7 +16,7 @@ | |||
16 | struct cmd_results *cmd_exec_always(int argc, char **argv) { | 16 | struct cmd_results *cmd_exec_always(int argc, char **argv) { |
17 | struct cmd_results *error = NULL; | 17 | struct cmd_results *error = NULL; |
18 | if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); | 18 | if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); |
19 | if ((error = checkarg(argc, argv[-1], EXPECTED_MORE_THAN, 0))) { | 19 | if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) { |
20 | return error; | 20 | return error; |
21 | } | 21 | } |
22 | 22 | ||
@@ -24,7 +24,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { | |||
24 | if (strcmp(argv[0], "--no-startup-id") == 0) { | 24 | if (strcmp(argv[0], "--no-startup-id") == 0) { |
25 | wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored."); | 25 | wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored."); |
26 | --argc; ++argv; | 26 | --argc; ++argv; |
27 | if ((error = checkarg(argc, argv[-1], EXPECTED_MORE_THAN, 0))) { | 27 | if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) { |
28 | return error; | 28 | return error; |
29 | } | 29 | } |
30 | } | 30 | } |
diff --git a/sway/commands/layout.c b/sway/commands/layout.c index c2ce2e78..65f67af8 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c | |||
@@ -96,7 +96,7 @@ static enum sway_container_layout get_layout(int argc, char **argv, | |||
96 | 96 | ||
97 | struct cmd_results *cmd_layout(int argc, char **argv) { | 97 | struct cmd_results *cmd_layout(int argc, char **argv) { |
98 | struct cmd_results *error = NULL; | 98 | struct cmd_results *error = NULL; |
99 | if ((error = checkarg(argc, "layout", EXPECTED_MORE_THAN, 0))) { | 99 | if ((error = checkarg(argc, "layout", EXPECTED_AT_LEAST, 1))) { |
100 | return error; | 100 | return error; |
101 | } | 101 | } |
102 | struct sway_container *container = config->handler_context.container; | 102 | struct sway_container *container = config->handler_context.container; |