summaryrefslogtreecommitdiffstats
path: root/sway/commands
diff options
context:
space:
mode:
authorLibravatar Ian Fan <ianfan0@gmail.com>2018-10-23 10:17:58 +0100
committerLibravatar Ian Fan <ianfan0@gmail.com>2018-10-23 10:17:58 +0100
commit5364255f265da2e324f65369037d5828688d08cd (patch)
tree8ef7afa00e71186f03a46d3d1ab3467a5e428102 /sway/commands
parentcommands: print correct command on error for exec and opacity (diff)
downloadsway-5364255f265da2e324f65369037d5828688d08cd.tar.gz
sway-5364255f265da2e324f65369037d5828688d08cd.tar.zst
sway-5364255f265da2e324f65369037d5828688d08cd.zip
commands: remove EXPECTED_MORE_THAN
Its uses have been replaced with EXPECTED_AT_LEAST.
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/bar/bindsym.c2
-rw-r--r--sway/commands/bind.c2
-rw-r--r--sway/commands/exec_always.c4
-rw-r--r--sway/commands/layout.c2
4 files changed, 5 insertions, 5 deletions
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
11struct cmd_results *bar_cmd_bindsym(int argc, char **argv) { 11struct 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 @@
16struct cmd_results *cmd_exec_always(int argc, char **argv) { 16struct 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
97struct cmd_results *cmd_layout(int argc, char **argv) { 97struct 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;