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.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/commands/input.c') diff --git a/sway/commands/input.c b/sway/commands/input.c index b5765c38..1f77507a 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c @@ -49,7 +49,7 @@ struct cmd_results *cmd_input(int argc, char **argv) { config->handler_context.input_config = new_input_config(argv[0]); if (!config->handler_context.input_config) { - return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config"); + return cmd_results_new(CMD_FAILURE, "Couldn't allocate config"); } struct cmd_results *res; @@ -60,7 +60,7 @@ struct cmd_results *cmd_input(int argc, char **argv) { res = config_subcommand(argv + 1, argc - 1, input_config_handlers, sizeof(input_config_handlers)); } else { - res = cmd_results_new(CMD_FAILURE, "input", + res = cmd_results_new(CMD_FAILURE, "Can only be used in config file."); } } else { -- cgit v1.2.3