diff options
author | M Stoeckl <[email protected]> | 2019-01-10 18:27:21 -0500 |
---|---|---|
committer | M Stoeckl <[email protected]> | 2019-01-14 08:05:29 -0500 |
commit | 2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (patch) | |
tree | 56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/mark.c | |
parent | 6d392150a72ecc3b69fcfb48865f625e2c7b79d6 (diff) |
Remove now-unused "input" argument of cmd_results_new
Patch tested by compiling with `__attribute__ ((format (printf, 2, 3)))`
applied to `cmd_results_new`.
String usage constants have been converted from pointers to arrays when
encountered. General handler format strings were sometimes modified to
include the old input string, especially for unknown command errors.
Diffstat (limited to 'sway/commands/mark.c')
-rw-r--r-- | sway/commands/mark.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sway/commands/mark.c b/sway/commands/mark.c index c76e1d63..aa5f185c 100644 --- a/sway/commands/mark.c +++ b/sway/commands/mark.c @@ -20,8 +20,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) { } struct sway_container *container = config->handler_context.container; if (!container) { - return cmd_results_new(CMD_INVALID, "mark", - "Only containers can have marks"); + return cmd_results_new(CMD_INVALID, "Only containers can have marks"); } bool add = false, toggle = false; @@ -33,7 +32,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) { } else if (strcmp(*argv, "--toggle") == 0) { toggle = true; } else { - return cmd_results_new(CMD_INVALID, "mark", + return cmd_results_new(CMD_INVALID, "Unrecognized argument '%s'", *argv); } ++argv; @@ -41,7 +40,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) { } if (!argc) { - return cmd_results_new(CMD_INVALID, "mark", + return cmd_results_new(CMD_INVALID, "Expected '[--add|--replace] [--toggle] <identifier>'"); } @@ -65,5 +64,5 @@ struct cmd_results *cmd_mark(int argc, char **argv) { view_execute_criteria(container->view); } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } |