aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/bar/tray_bindsym.c
diff options
context:
space:
mode:
authorM Stoeckl <code@mstoeckl.com>2019-01-10 18:27:21 -0500
committerM Stoeckl <code@mstoeckl.com>2019-01-14 08:05:29 -0500
commit2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (patch)
tree56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/bar/tray_bindsym.c
parent6d392150a72ecc3b69fcfb48865f625e2c7b79d6 (diff)
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/tray_bindsym.c')
-rw-r--r--sway/commands/bar/tray_bindsym.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/commands/bar/tray_bindsym.c b/sway/commands/bar/tray_bindsym.c
index ad413446..4e57e35e 100644
--- a/sway/commands/bar/tray_bindsym.c
+++ b/sway/commands/bar/tray_bindsym.c
@@ -12,7 +12,7 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) {
}
if (!config->current_bar) {
- return cmd_results_new(CMD_FAILURE, "tray_bindsym", "No bar defined.");
+ return cmd_results_new(CMD_FAILURE, "No bar defined.");
}
int button = 0;
@@ -21,7 +21,7 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) {
button = argv[0][strlen("button")] - '0';
}
if (button < 1 || button > 9) {
- return cmd_results_new(CMD_FAILURE, "tray_bindsym",
+ return cmd_results_new(CMD_FAILURE,
"[Bar %s] Only buttons 1 to 9 are supported",
config->current_bar->id);
}
@@ -42,14 +42,14 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) {
wlr_log(WLR_DEBUG, "[Bar %s] Binding button %d to %s",
config->current_bar->id, button, commands[i]);
config->current_bar->tray_bindings[button] = commands[i];
- return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+ return cmd_results_new(CMD_SUCCESS, NULL);
}
}
- return cmd_results_new(CMD_INVALID, "tray_bindsym",
+ return cmd_results_new(CMD_INVALID,
"[Bar %s] Invalid command %s", config->current_bar->id, argv[1]);
#else
- return cmd_results_new(CMD_INVALID, "tray_bindsym",
+ return cmd_results_new(CMD_INVALID,
"Sway has been compiled without tray support");
#endif
}