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/map_from_region.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'sway/commands/input/map_from_region.c') diff --git a/sway/commands/input/map_from_region.c b/sway/commands/input/map_from_region.c index 53608a67..de00b714 100644 --- a/sway/commands/input/map_from_region.c +++ b/sway/commands/input/map_from_region.c @@ -40,8 +40,7 @@ struct cmd_results *input_cmd_map_from_region(int argc, char **argv) { } struct input_config *ic = config->handler_context.input_config; if (!ic) { - return cmd_results_new(CMD_FAILURE, "map_from_region", - "No input device defined"); + return cmd_results_new(CMD_FAILURE, "No input device defined"); } ic->mapped_from_region = @@ -52,30 +51,27 @@ struct cmd_results *input_cmd_map_from_region(int argc, char **argv) { &ic->mapped_from_region->y1, &mm1)) { free(ic->mapped_from_region); ic->mapped_from_region = NULL; - return cmd_results_new(CMD_FAILURE, "map_from_region", - "Invalid top-left coordinates"); + return cmd_results_new(CMD_FAILURE, "Invalid top-left coordinates"); } if (!parse_coords(argv[1], &ic->mapped_from_region->x2, &ic->mapped_from_region->y2, &mm2)) { free(ic->mapped_from_region); ic->mapped_from_region = NULL; - return cmd_results_new(CMD_FAILURE, "map_from_region", - "Invalid bottom-right coordinates"); + return cmd_results_new(CMD_FAILURE, "Invalid bottom-right coordinates"); } if (ic->mapped_from_region->x1 > ic->mapped_from_region->x2 || ic->mapped_from_region->y1 > ic->mapped_from_region->y2) { free(ic->mapped_from_region); ic->mapped_from_region = NULL; - return cmd_results_new(CMD_FAILURE, "map_from_region", - "Invalid rectangle"); + return cmd_results_new(CMD_FAILURE, "Invalid rectangle"); } if (mm1 != mm2) { free(ic->mapped_from_region); ic->mapped_from_region = NULL; - return cmd_results_new(CMD_FAILURE, "map_from_region", + return cmd_results_new(CMD_FAILURE, "Both coordinates must be in the same unit"); } ic->mapped_from_region->mm = mm1; - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3