From 2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Thu, 10 Jan 2019 18:27:21 -0500 Subject: 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. --- sway/commands/split.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sway/commands/split.c') diff --git a/sway/commands/split.c b/sway/commands/split.c index 84385fa9..ed370d26 100644 --- a/sway/commands/split.c +++ b/sway/commands/split.c @@ -24,7 +24,7 @@ static struct cmd_results *do_split(int layout) { arrange_workspace(ws); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } struct cmd_results *cmd_split(int argc, char **argv) { @@ -33,7 +33,7 @@ struct cmd_results *cmd_split(int argc, char **argv) { return error; } if (!root->outputs->length) { - return cmd_results_new(CMD_INVALID, "split", + return cmd_results_new(CMD_INVALID, "Can't run this command while there's no outputs connected."); } if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) { @@ -51,10 +51,10 @@ struct cmd_results *cmd_split(int argc, char **argv) { return do_split(L_VERT); } } else { - return cmd_results_new(CMD_FAILURE, "split", + return cmd_results_new(CMD_FAILURE, "Invalid split command (expected either horizontal or vertical)."); } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } struct cmd_results *cmd_splitv(int argc, char **argv) { -- cgit v1.2.3