From 5364255f265da2e324f65369037d5828688d08cd Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Tue, 23 Oct 2018 10:17:58 +0100 Subject: commands: remove EXPECTED_MORE_THAN Its uses have been replaced with EXPECTED_AT_LEAST. --- sway/commands.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'sway/commands.c') 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 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type, int val) { struct cmd_results *error = NULL; switch (type) { - case EXPECTED_MORE_THAN: - if (argc > val) { - return NULL; - } - error = cmd_results_new(CMD_INVALID, name, "Invalid %s command " - "(expected more than %d argument%s, got %d)", - name, val, (char*[2]){"s", ""}[argc==1], argc); - break; case EXPECTED_AT_LEAST: if (argc >= val) { return NULL; -- cgit v1.2.3 From 000d96e52539fd6b8ecf6f6d0d399a1bedbbb9d9 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Tue, 23 Oct 2018 10:32:05 +0100 Subject: commands: clean-up checkarg function Consolidates logic and fixes mistake that used argc instead of val for determining plural. --- sway/commands.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'sway/commands.c') 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 @@ // Returns error object, or NULL if check succeeds. struct cmd_results *checkarg(int argc, const char *name, enum expected_args type, int val) { - struct cmd_results *error = NULL; + const char *error_name = NULL; switch (type) { case EXPECTED_AT_LEAST: - if (argc >= val) { - return NULL; + if (argc < val) { + error_name = "at least "; } - error = cmd_results_new(CMD_INVALID, name, "Invalid %s command " - "(expected at least %d argument%s, got %d)", - name, val, (char*[2]){"s", ""}[argc==1], argc); break; case EXPECTED_LESS_THAN: - if (argc < val) { - return NULL; - }; - error = cmd_results_new(CMD_INVALID, name, "Invalid %s command " - "(expected less than %d argument%s, got %d)", - name, val, (char*[2]){"s", ""}[argc==1], argc); + if (argc >= val) { + error_name = "less than "; + } break; case EXPECTED_EQUAL_TO: - if (argc == val) { - return NULL; - }; - error = cmd_results_new(CMD_INVALID, name, "Invalid %s command " - "(expected %d arguments, got %d)", name, val, argc); - break; + if (argc != val) { + error_name = ""; + } } - return error; + return error_name ? + cmd_results_new(CMD_INVALID, name, "Invalid %s command " + "(expected %s%d argument%s, got %d)", + name, error_name, val, val != 1 ? "s" : "", argc) + : NULL; } void apply_seat_config(struct seat_config *seat_config) { -- cgit v1.2.3 From 9227cb7d673b012a0c6730800d528f9d729972b6 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Tue, 23 Oct 2018 10:40:03 +0100 Subject: commands: replace EXPECTED_LESS_THAN with EXPECTED_AT_MOST This makes it a bit more obvious what the expected number of arguments is. --- include/sway/commands.h | 2 +- sway/commands.c | 6 +++--- sway/commands/bar/hidden_state.c | 2 +- sway/commands/bar/mode.c | 2 +- sway/commands/fullscreen.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sway/commands.c') diff --git a/include/sway/commands.h b/include/sway/commands.h index 791b37dc..6606775a 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -40,7 +40,7 @@ struct cmd_results { enum expected_args { EXPECTED_AT_LEAST, - EXPECTED_LESS_THAN, + EXPECTED_AT_MOST, EXPECTED_EQUAL_TO }; 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 error_name = "at least "; } break; - case EXPECTED_LESS_THAN: - if (argc >= val) { - error_name = "less than "; + case EXPECTED_AT_MOST: + if (argc > val) { + error_name = "at most "; } break; 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) { if ((error = checkarg(argc, "hidden_state", EXPECTED_AT_LEAST, 1))) { return error; } - if ((error = checkarg(argc, "hidden_state", EXPECTED_LESS_THAN, 3))) { + if ((error = checkarg(argc, "hidden_state", EXPECTED_AT_MOST, 2))) { return error; } 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) { if ((error = checkarg(argc, "mode", EXPECTED_AT_LEAST, 1))) { return error; } - if ((error = checkarg(argc, "mode", EXPECTED_LESS_THAN, 3))) { + if ((error = checkarg(argc, "mode", EXPECTED_AT_MOST, 2))) { return error; } 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 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) { struct cmd_results *error = NULL; - if ((error = checkarg(argc, "fullscreen", EXPECTED_LESS_THAN, 2))) { + if ((error = checkarg(argc, "fullscreen", EXPECTED_AT_MOST, 1))) { return error; } struct sway_node *node = config->handler_context.node; -- cgit v1.2.3