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/client.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sway/commands/client.c') diff --git a/sway/commands/client.c b/sway/commands/client.c index 746e8713..10bfa519 100644 --- a/sway/commands/client.c +++ b/sway/commands/client.c @@ -61,27 +61,27 @@ static struct cmd_results *handle_command(int argc, char **argv, } if (!parse_color_float(argv[0], class->border)) { - return cmd_results_new(CMD_INVALID, cmd_name, + return cmd_results_new(CMD_INVALID, "Unable to parse border color '%s'", argv[0]); } if (!parse_color_float(argv[1], class->background)) { - return cmd_results_new(CMD_INVALID, cmd_name, + return cmd_results_new(CMD_INVALID, "Unable to parse background color '%s'", argv[1]); } if (!parse_color_float(argv[2], class->text)) { - return cmd_results_new(CMD_INVALID, cmd_name, + return cmd_results_new(CMD_INVALID, "Unable to parse text color '%s'", argv[2]); } if (!parse_color_float(argv[3], class->indicator)) { - return cmd_results_new(CMD_INVALID, cmd_name, + return cmd_results_new(CMD_INVALID, "Unable to parse indicator color '%s'", argv[3]); } if (!parse_color_float(argv[4], class->child_border)) { - return cmd_results_new(CMD_INVALID, cmd_name, + return cmd_results_new(CMD_INVALID, "Unable to parse child border color '%s'", argv[4]); } @@ -94,7 +94,7 @@ static struct cmd_results *handle_command(int argc, char **argv, } } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } struct cmd_results *cmd_client_focused(int argc, char **argv) { @@ -115,5 +115,5 @@ struct cmd_results *cmd_client_urgent(int argc, char **argv) { struct cmd_results *cmd_client_noop(int argc, char **argv) { wlr_log(WLR_INFO, "Warning: %s is ignored by sway", argv[-1]); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3