summaryrefslogtreecommitdiff
path: root/sway/commands/bar/bind.c
diff options
context:
space:
mode:
authorM Stoeckl <[email protected]>2019-01-10 18:27:21 -0500
committerM Stoeckl <[email protected]>2019-01-14 08:05:29 -0500
commit2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (patch)
tree56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/bar/bind.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/bind.c')
-rw-r--r--sway/commands/bar/bind.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sway/commands/bar/bind.c b/sway/commands/bar/bind.c
index a4c65ec4..71adced8 100644
--- a/sway/commands/bar/bind.c
+++ b/sway/commands/bar/bind.c
@@ -16,13 +16,12 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) {
return error;
}
if (!config->current_bar) {
- return cmd_results_new(CMD_FAILURE, command, "No bar defined.");
+ return cmd_results_new(CMD_FAILURE, "No bar defined.");
}
struct bar_binding *binding = calloc(1, sizeof(struct bar_binding));
if (!binding) {
- return cmd_results_new(CMD_FAILURE, command,
- "Unable to allocate bar binding");
+ return cmd_results_new(CMD_FAILURE, "Unable to allocate bar binding");
}
binding->release = false;
@@ -40,13 +39,12 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) {
}
if (message) {
free_bar_binding(binding);
- error = cmd_results_new(CMD_INVALID, command, message);
+ error = cmd_results_new(CMD_INVALID, message);
free(message);
return error;
} else if (!binding->button) {
free_bar_binding(binding);
- return cmd_results_new(CMD_INVALID, command,
- "Unknown button %s", argv[0]);
+ return cmd_results_new(CMD_INVALID, "Unknown button %s", argv[0]);
}
const char *name = libevdev_event_code_get_name(EV_KEY, binding->button);
@@ -94,7 +92,7 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) {
binding->release ? " - release" : "");
}
- return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+ return cmd_results_new(CMD_SUCCESS, NULL);
}
struct cmd_results *bar_cmd_bindcode(int argc, char **argv) {