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/reload.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sway/commands/reload.c') diff --git a/sway/commands/reload.c b/sway/commands/reload.c index 3ccbbf34..6e7772e9 100644 --- a/sway/commands/reload.c +++ b/sway/commands/reload.c @@ -56,13 +56,12 @@ struct cmd_results *cmd_reload(int argc, char **argv) { } if (!load_main_config(config->current_config_path, true, true)) { - return cmd_results_new(CMD_FAILURE, "reload", - "Error(s) reloading config."); + return cmd_results_new(CMD_FAILURE, "Error(s) reloading config."); } // The reload command frees a lot of stuff, so to avoid use-after-frees // we schedule the reload to happen using an idle event. wl_event_loop_add_idle(server.wl_event_loop, do_reload, NULL); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3