mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-05 07:15:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove now-unused "input" argument of cmd_results_new

Browse source 
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.
This commit is contained in:
M Stoeckl 2019-01-10 18:27:21 -05:00
parent 6d392150a7
commit 2a684cad5f
131 changed files with 503 additions and 601 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/commands/layout.c
View file

@ -20,7 +20,7 @@ static enum sway_container_layout parse_layout_string(char *s) {
return L_NONE;
}
static const char* expected_syntax =
static const char expected_syntax[] =
"Expected 'layout default|tabbed|stacking|splitv|splith' or "
"'layout toggle [split|all]' or "
"'layout toggle [split|tabbed|stacking|splitv|splith] [split|tabbed|stacking|splitv|splith]...'";
@ -100,14 +100,14 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
return error;
}
if (!root->outputs->length) {
return cmd_results_new(CMD_INVALID, "layout",
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 && container_is_floating(container)) {
return cmd_results_new(CMD_FAILURE, "layout",
return cmd_results_new(CMD_FAILURE,
"Unable to change layout of floating windows");
}
@ -133,7 +133,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
workspace->layout, workspace->prev_split_layout);
}
if (new_layout == L_NONE) {
return cmd_results_new(CMD_INVALID, "layout", expected_syntax);
return cmd_results_new(CMD_INVALID, expected_syntax);
}
if (new_layout != old_layout) {
if (container) {
@ -152,5 +152,5 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
arrange_workspace(workspace);
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
return cmd_results_new(CMD_SUCCESS, NULL);
}