aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Ian Fan <ianfan0@gmail.com>2018-10-23 10:40:03 +0100
committerLibravatar Ian Fan <ianfan0@gmail.com>2018-10-23 10:51:54 +0100
commit9227cb7d673b012a0c6730800d528f9d729972b6 (patch)
tree32f4a9782328486f529c09fe2bb8092c25b9993d /sway
parentcommands: clean-up checkarg function (diff)
downloadsway-9227cb7d673b012a0c6730800d528f9d729972b6.tar.gz
sway-9227cb7d673b012a0c6730800d528f9d729972b6.tar.zst
sway-9227cb7d673b012a0c6730800d528f9d729972b6.zip
commands: replace EXPECTED_LESS_THAN with EXPECTED_AT_MOST
This makes it a bit more obvious what the expected number of arguments is.
Diffstat (limited to 'sway')
-rw-r--r--sway/commands.c6
-rw-r--r--sway/commands/bar/hidden_state.c2
-rw-r--r--sway/commands/bar/mode.c2
-rw-r--r--sway/commands/fullscreen.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/sway/commands.c b/sway/commands.c
index 6a5eb3dd..37c7169a 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -25,9 +25,9 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type
25 error_name = "at least "; 25 error_name = "at least ";
26 } 26 }
27 break; 27 break;
28 case EXPECTED_LESS_THAN: 28 case EXPECTED_AT_MOST:
29 if (argc >= val) { 29 if (argc > val) {
30 error_name = "less than "; 30 error_name = "at most ";
31 } 31 }
32 break; 32 break;
33 case EXPECTED_EQUAL_TO: 33 case EXPECTED_EQUAL_TO:
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 28adf6c7..5be6c2dc 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -40,7 +40,7 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
40 if ((error = checkarg(argc, "hidden_state", EXPECTED_AT_LEAST, 1))) { 40 if ((error = checkarg(argc, "hidden_state", EXPECTED_AT_LEAST, 1))) {
41 return error; 41 return error;
42 } 42 }
43 if ((error = checkarg(argc, "hidden_state", EXPECTED_LESS_THAN, 3))) { 43 if ((error = checkarg(argc, "hidden_state", EXPECTED_AT_MOST, 2))) {
44 return error; 44 return error;
45 } 45 }
46 if (config->reading && argc > 1) { 46 if (config->reading && argc > 1) {
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index dbdd3897..2cba785e 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -41,7 +41,7 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) {
41 if ((error = checkarg(argc, "mode", EXPECTED_AT_LEAST, 1))) { 41 if ((error = checkarg(argc, "mode", EXPECTED_AT_LEAST, 1))) {
42 return error; 42 return error;
43 } 43 }
44 if ((error = checkarg(argc, "mode", EXPECTED_LESS_THAN, 3))) { 44 if ((error = checkarg(argc, "mode", EXPECTED_AT_MOST, 2))) {
45 return error; 45 return error;
46 } 46 }
47 if (config->reading && argc > 1) { 47 if (config->reading && argc > 1) {
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 22d747b9..0204a73c 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -9,7 +9,7 @@
9 9
10struct cmd_results *cmd_fullscreen(int argc, char **argv) { 10struct cmd_results *cmd_fullscreen(int argc, char **argv) {
11 struct cmd_results *error = NULL; 11 struct cmd_results *error = NULL;
12 if ((error = checkarg(argc, "fullscreen", EXPECTED_LESS_THAN, 2))) { 12 if ((error = checkarg(argc, "fullscreen", EXPECTED_AT_MOST, 1))) {
13 return error; 13 return error;
14 } 14 }
15 struct sway_node *node = config->handler_context.node; 15 struct sway_node *node = config->handler_context.node;