aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/bar.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/bar.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/bar.c')
-rw-r--r--sway/commands/bar.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index 2a82d508..b19d9574 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -69,7 +69,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
69 wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]); 69 wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]);
70 bar = default_bar_config(); 70 bar = default_bar_config();
71 if (!bar) { 71 if (!bar) {
72 return cmd_results_new(CMD_FAILURE, "bar", 72 return cmd_results_new(CMD_FAILURE,
73 "Unable to allocate bar state"); 73 "Unable to allocate bar state");
74 } 74 }
75 75
@@ -83,7 +83,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
83 // Create new bar with default values 83 // Create new bar with default values
84 struct bar_config *bar = default_bar_config(); 84 struct bar_config *bar = default_bar_config();
85 if (!bar) { 85 if (!bar) {
86 return cmd_results_new(CMD_FAILURE, "bar", 86 return cmd_results_new(CMD_FAILURE,
87 "Unable to allocate bar state"); 87 "Unable to allocate bar state");
88 } 88 }
89 89
@@ -93,8 +93,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
93 if (bar->id) { 93 if (bar->id) {
94 snprintf(bar->id, len, "bar-%d", config->bars->length - 1); 94 snprintf(bar->id, len, "bar-%d", config->bars->length - 1);
95 } else { 95 } else {
96 return cmd_results_new(CMD_FAILURE, 96 return cmd_results_new(CMD_FAILURE, "Unable to allocate bar ID");
97 "bar", "Unable to allocate bar ID");
98 } 97 }
99 98
100 // Set current bar 99 // Set current bar
@@ -117,7 +116,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
117 } 116 }
118 } 117 }
119 } 118 }
120 return cmd_results_new(CMD_INVALID, "bar", 119 return cmd_results_new(CMD_INVALID,
121 "Can only be used in the config file."); 120 "Can only be used in the config file.");
122 } 121 }
123 122