From 2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Thu, 10 Jan 2019 18:27:21 -0500 Subject: 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. --- sway/commands/input/pointer_accel.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'sway/commands/input/pointer_accel.c') diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c index efd81ee6..e214b32f 100644 --- a/sway/commands/input/pointer_accel.c +++ b/sway/commands/input/pointer_accel.c @@ -13,19 +13,17 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) { } struct input_config *ic = config->handler_context.input_config; if (!ic) { - return cmd_results_new(CMD_FAILURE, - "pointer_accel", "No input device defined."); + return cmd_results_new(CMD_FAILURE, "No input device defined."); } float pointer_accel = parse_float(argv[0]); if (isnan(pointer_accel)) { - return cmd_results_new(CMD_INVALID, "pointer_accel", + return cmd_results_new(CMD_INVALID, "Invalid pointer accel; expected float."); } if (pointer_accel < -1 || pointer_accel > 1) { - return cmd_results_new(CMD_INVALID, "pointer_accel", - "Input out of range [-1, 1]"); + return cmd_results_new(CMD_INVALID, "Input out of range [-1, 1]"); } ic->pointer_accel = pointer_accel; - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3