diff options
Diffstat (limited to 'sway/commands/bar/bind.c')
-rw-r--r-- | sway/commands/bar/bind.c | 12 |
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) { | |||
16 | return error; | 16 | return error; |
17 | } | 17 | } |
18 | if (!config->current_bar) { | 18 | if (!config->current_bar) { |
19 | return cmd_results_new(CMD_FAILURE, command, "No bar defined."); | 19 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
20 | } | 20 | } |
21 | 21 | ||
22 | struct bar_binding *binding = calloc(1, sizeof(struct bar_binding)); | 22 | struct bar_binding *binding = calloc(1, sizeof(struct bar_binding)); |
23 | if (!binding) { | 23 | if (!binding) { |
24 | return cmd_results_new(CMD_FAILURE, command, | 24 | return cmd_results_new(CMD_FAILURE, "Unable to allocate bar binding"); |
25 | "Unable to allocate bar binding"); | ||
26 | } | 25 | } |
27 | 26 | ||
28 | binding->release = false; | 27 | binding->release = false; |
@@ -40,13 +39,12 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) { | |||
40 | } | 39 | } |
41 | if (message) { | 40 | if (message) { |
42 | free_bar_binding(binding); | 41 | free_bar_binding(binding); |
43 | error = cmd_results_new(CMD_INVALID, command, message); | 42 | error = cmd_results_new(CMD_INVALID, message); |
44 | free(message); | 43 | free(message); |
45 | return error; | 44 | return error; |
46 | } else if (!binding->button) { | 45 | } else if (!binding->button) { |
47 | free_bar_binding(binding); | 46 | free_bar_binding(binding); |
48 | return cmd_results_new(CMD_INVALID, command, | 47 | return cmd_results_new(CMD_INVALID, "Unknown button %s", argv[0]); |
49 | "Unknown button %s", argv[0]); | ||
50 | } | 48 | } |
51 | 49 | ||
52 | const char *name = libevdev_event_code_get_name(EV_KEY, binding->button); | 50 | 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) { | |||
94 | binding->release ? " - release" : ""); | 92 | binding->release ? " - release" : ""); |
95 | } | 93 | } |
96 | 94 | ||
97 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 95 | return cmd_results_new(CMD_SUCCESS, NULL); |
98 | } | 96 | } |
99 | 97 | ||
100 | struct cmd_results *bar_cmd_bindcode(int argc, char **argv) { | 98 | struct cmd_results *bar_cmd_bindcode(int argc, char **argv) { |