aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/floating.c
diff options
context:
space:
mode:
authorLibravatar M Stoeckl <code@mstoeckl.com>2019-01-10 18:27:21 -0500
committerLibravatar M Stoeckl <code@mstoeckl.com>2019-01-14 08:05:29 -0500
commit2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (patch)
tree56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/floating.c
parentRemove 'input' field of IPC command return json (diff)
downloadsway-2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0.tar.gz
sway-2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0.tar.zst
sway-2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0.zip
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/floating.c')
-rw-r--r--sway/commands/floating.c7
1 files changed, 3 insertions, 4 deletions
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) {
17 return error; 17 return error;
18 } 18 }
19 if (!root->outputs->length) { 19 if (!root->outputs->length) {
20 return cmd_results_new(CMD_INVALID, "floating", 20 return cmd_results_new(CMD_INVALID,
21 "Can't run this command while there's no outputs connected."); 21 "Can't run this command while there's no outputs connected.");
22 } 22 }
23 struct sway_container *container = config->handler_context.container; 23 struct sway_container *container = config->handler_context.container;
24 struct sway_workspace *workspace = config->handler_context.workspace; 24 struct sway_workspace *workspace = config->handler_context.workspace;
25 if (!container && workspace->tiling->length == 0) { 25 if (!container && workspace->tiling->length == 0) {
26 return cmd_results_new(CMD_INVALID, "floating", 26 return cmd_results_new(CMD_INVALID, "Can't float an empty workspace");
27 "Can't float an empty workspace");
28 } 27 }
29 if (!container) { 28 if (!container) {
30 // Wrap the workspace's children in a container so we can float it 29 // 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) {
48 47
49 arrange_workspace(container->workspace); 48 arrange_workspace(container->workspace);
50 49
51 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 50 return cmd_results_new(CMD_SUCCESS, NULL);
52} 51}