diff options
author | 2019-01-10 18:27:21 -0500 | |
---|---|---|
committer | 2019-01-14 08:05:29 -0500 | |
commit | 2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (patch) | |
tree | 56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/client.c | |
parent | Remove 'input' field of IPC command return json (diff) | |
download | sway-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/client.c')
-rw-r--r-- | sway/commands/client.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/commands/client.c b/sway/commands/client.c index 746e8713..10bfa519 100644 --- a/sway/commands/client.c +++ b/sway/commands/client.c | |||
@@ -61,27 +61,27 @@ static struct cmd_results *handle_command(int argc, char **argv, | |||
61 | } | 61 | } |
62 | 62 | ||
63 | if (!parse_color_float(argv[0], class->border)) { | 63 | if (!parse_color_float(argv[0], class->border)) { |
64 | return cmd_results_new(CMD_INVALID, cmd_name, | 64 | return cmd_results_new(CMD_INVALID, |
65 | "Unable to parse border color '%s'", argv[0]); | 65 | "Unable to parse border color '%s'", argv[0]); |
66 | } | 66 | } |
67 | 67 | ||
68 | if (!parse_color_float(argv[1], class->background)) { | 68 | if (!parse_color_float(argv[1], class->background)) { |
69 | return cmd_results_new(CMD_INVALID, cmd_name, | 69 | return cmd_results_new(CMD_INVALID, |
70 | "Unable to parse background color '%s'", argv[1]); | 70 | "Unable to parse background color '%s'", argv[1]); |
71 | } | 71 | } |
72 | 72 | ||
73 | if (!parse_color_float(argv[2], class->text)) { | 73 | if (!parse_color_float(argv[2], class->text)) { |
74 | return cmd_results_new(CMD_INVALID, cmd_name, | 74 | return cmd_results_new(CMD_INVALID, |
75 | "Unable to parse text color '%s'", argv[2]); | 75 | "Unable to parse text color '%s'", argv[2]); |
76 | } | 76 | } |
77 | 77 | ||
78 | if (!parse_color_float(argv[3], class->indicator)) { | 78 | if (!parse_color_float(argv[3], class->indicator)) { |
79 | return cmd_results_new(CMD_INVALID, cmd_name, | 79 | return cmd_results_new(CMD_INVALID, |
80 | "Unable to parse indicator color '%s'", argv[3]); | 80 | "Unable to parse indicator color '%s'", argv[3]); |
81 | } | 81 | } |
82 | 82 | ||
83 | if (!parse_color_float(argv[4], class->child_border)) { | 83 | if (!parse_color_float(argv[4], class->child_border)) { |
84 | return cmd_results_new(CMD_INVALID, cmd_name, | 84 | return cmd_results_new(CMD_INVALID, |
85 | "Unable to parse child border color '%s'", argv[4]); | 85 | "Unable to parse child border color '%s'", argv[4]); |
86 | } | 86 | } |
87 | 87 | ||
@@ -94,7 +94,7 @@ static struct cmd_results *handle_command(int argc, char **argv, | |||
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
97 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 97 | return cmd_results_new(CMD_SUCCESS, NULL); |
98 | } | 98 | } |
99 | 99 | ||
100 | struct cmd_results *cmd_client_focused(int argc, char **argv) { | 100 | struct cmd_results *cmd_client_focused(int argc, char **argv) { |
@@ -115,5 +115,5 @@ struct cmd_results *cmd_client_urgent(int argc, char **argv) { | |||
115 | 115 | ||
116 | struct cmd_results *cmd_client_noop(int argc, char **argv) { | 116 | struct cmd_results *cmd_client_noop(int argc, char **argv) { |
117 | wlr_log(WLR_INFO, "Warning: %s is ignored by sway", argv[-1]); | 117 | wlr_log(WLR_INFO, "Warning: %s is ignored by sway", argv[-1]); |
118 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 118 | return cmd_results_new(CMD_SUCCESS, NULL); |
119 | } | 119 | } |