diff options
-rw-r--r-- | sway/commands.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/sway/commands.c b/sway/commands.c index 4c1b34d5..6a5eb3dd 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -18,33 +18,28 @@ | |||
18 | 18 | ||
19 | // Returns error object, or NULL if check succeeds. | 19 | // Returns error object, or NULL if check succeeds. |
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 | const char *error_name = NULL; |
22 | switch (type) { | 22 | switch (type) { |
23 | case EXPECTED_AT_LEAST: | 23 | case EXPECTED_AT_LEAST: |
24 | if (argc >= val) { | 24 | if (argc < val) { |
25 | return NULL; | 25 | error_name = "at least "; |
26 | } | 26 | } |
27 | error = cmd_results_new(CMD_INVALID, name, "Invalid %s command " | ||
28 | "(expected at least %d argument%s, got %d)", | ||
29 | name, val, (char*[2]){"s", ""}[argc==1], argc); | ||
30 | break; | 27 | break; |
31 | case EXPECTED_LESS_THAN: | 28 | case EXPECTED_LESS_THAN: |
32 | if (argc < val) { | 29 | if (argc >= val) { |
33 | return NULL; | 30 | error_name = "less than "; |
34 | }; | 31 | } |
35 | error = cmd_results_new(CMD_INVALID, name, "Invalid %s command " | ||
36 | "(expected less than %d argument%s, got %d)", | ||
37 | name, val, (char*[2]){"s", ""}[argc==1], argc); | ||
38 | break; | 32 | break; |
39 | case EXPECTED_EQUAL_TO: | 33 | case EXPECTED_EQUAL_TO: |
40 | if (argc == val) { | 34 | if (argc != val) { |
41 | return NULL; | 35 | error_name = ""; |
42 | }; | 36 | } |
43 | error = cmd_results_new(CMD_INVALID, name, "Invalid %s command " | ||
44 | "(expected %d arguments, got %d)", name, val, argc); | ||
45 | break; | ||
46 | } | 37 | } |
47 | return error; | 38 | return error_name ? |
39 | cmd_results_new(CMD_INVALID, name, "Invalid %s command " | ||
40 | "(expected %s%d argument%s, got %d)", | ||
41 | name, error_name, val, val != 1 ? "s" : "", argc) | ||
42 | : NULL; | ||
48 | } | 43 | } |
49 | 44 | ||
50 | void apply_seat_config(struct seat_config *seat_config) { | 45 | void apply_seat_config(struct seat_config *seat_config) { |