alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

commands: replace EXPECTED_LESS_THAN with EXPECTED_AT_MOST

Browse source 
This makes it a bit more obvious what the expected number of arguments is.
This commit is contained in:
Ian Fan 2018-10-23 10:40:03 +01:00
parent 000d96e525
commit 9227cb7d67
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/commands.h
View file

@ -40,7 +40,7 @@ struct cmd_results {
enum expected_args {
EXPECTED_AT_LEAST,
EXPECTED_LESS_THAN,
EXPECTED_AT_MOST,
EXPECTED_EQUAL_TO
};

6
sway/commands.c
View file

@ -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:

2
sway/commands/bar/hidden_state.c
View file

@ -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) {

2
sway/commands/bar/mode.c
View file

@ -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) {

2
sway/commands/fullscreen.c
View file

@ -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;