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/scratchpad.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'sway/commands/scratchpad.c') diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c index 6eab456d..1162d51f 100644 --- a/sway/commands/scratchpad.c +++ b/sway/commands/scratchpad.c @@ -84,16 +84,14 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) { return error; } if (strcmp(argv[0], "show") != 0) { - return cmd_results_new(CMD_INVALID, "scratchpad", - "Expected 'scratchpad show'"); + return cmd_results_new(CMD_INVALID, "Expected 'scratchpad show'"); } if (!root->outputs->length) { - return cmd_results_new(CMD_INVALID, "scratchpad", + return cmd_results_new(CMD_INVALID, "Can't run this command while there's no outputs connected."); } if (!root->scratchpad->length) { - return cmd_results_new(CMD_INVALID, "scratchpad", - "Scratchpad is empty"); + return cmd_results_new(CMD_INVALID, "Scratchpad is empty"); } if (config->handler_context.using_criteria) { @@ -111,12 +109,12 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) { // matches the criteria. If this container isn't in the scratchpad, // we'll just silently return a success. if (!con->scratchpad) { - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } scratchpad_toggle_container(con); } else { scratchpad_toggle_auto(); } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3-54-g00ecf