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/floating.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sway/commands/floating.c') diff --git a/sway/commands/floating.c b/sway/commands/floating.c index 4b82921c..e95f3185 100644 --- a/sway/commands/floating.c +++ b/sway/commands/floating.c @@ -17,14 +17,13 @@ struct cmd_results *cmd_floating(int argc, char **argv) { return error; } if (!root->outputs->length) { - return cmd_results_new(CMD_INVALID, "floating", + return cmd_results_new(CMD_INVALID, "Can't run this command while there's no outputs connected."); } struct sway_container *container = config->handler_context.container; struct sway_workspace *workspace = config->handler_context.workspace; if (!container && workspace->tiling->length == 0) { - return cmd_results_new(CMD_INVALID, "floating", - "Can't float an empty workspace"); + return cmd_results_new(CMD_INVALID, "Can't float an empty workspace"); } if (!container) { // Wrap the workspace's children in a container so we can float it @@ -48,5 +47,5 @@ struct cmd_results *cmd_floating(int argc, char **argv) { arrange_workspace(container->workspace); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3