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/bar/position.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sway/commands/bar/position.c') diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c index 2870f60f..2e3f79b4 100644 --- a/sway/commands/bar/position.c +++ b/sway/commands/bar/position.c @@ -10,7 +10,7 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) { return error; } if (!config->current_bar) { - return cmd_results_new(CMD_FAILURE, "position", "No bar defined."); + return cmd_results_new(CMD_FAILURE, "No bar defined."); } char *valid[] = { "top", "bottom" }; for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) { @@ -19,9 +19,8 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) { argv[0], config->current_bar->id); free(config->current_bar->position); config->current_bar->position = strdup(argv[0]); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } } - return cmd_results_new(CMD_INVALID, - "position", "Invalid value %s", argv[0]); + return cmd_results_new(CMD_INVALID, "Invalid value %s", argv[0]); } -- cgit v1.2.3