diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-14 11:44:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-14 11:44:18 -0500 |
commit | 15cd8b6a86295a445a1037afd0028b1226a14c82 (patch) | |
tree | 56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/input/scroll_factor.c | |
parent | 64ef9366733d6d332a24897f72eba90ba2adca1e (diff) | |
parent | 2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (diff) |
Merge pull request #3403 from mstoeckl/ipcleanup
Remove 'input' field of IPC command return json
Diffstat (limited to 'sway/commands/input/scroll_factor.c')
-rw-r--r-- | sway/commands/input/scroll_factor.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sway/commands/input/scroll_factor.c b/sway/commands/input/scroll_factor.c index 52d943b0..4b72b6fa 100644 --- a/sway/commands/input/scroll_factor.c +++ b/sway/commands/input/scroll_factor.c @@ -14,19 +14,18 @@ struct cmd_results *input_cmd_scroll_factor(int argc, char **argv) { } struct input_config *ic = config->handler_context.input_config; if (!ic) { - return cmd_results_new(CMD_FAILURE, - "scroll_factor", "No input device defined."); + return cmd_results_new(CMD_FAILURE, "No input device defined."); } float scroll_factor = parse_float(argv[0]); if (isnan(scroll_factor)) { - return cmd_results_new(CMD_INVALID, "scroll_factor", + return cmd_results_new(CMD_INVALID, "Invalid scroll factor; expected float."); } else if (scroll_factor < 0) { - return cmd_results_new(CMD_INVALID, "scroll_factor", + return cmd_results_new(CMD_INVALID, "Scroll factor cannot be negative."); } ic->scroll_factor = scroll_factor; - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } |