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/titlebar_padding.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sway/commands/titlebar_padding.c') diff --git a/sway/commands/titlebar_padding.c b/sway/commands/titlebar_padding.c index a642e945..29ce59ff 100644 --- a/sway/commands/titlebar_padding.c +++ b/sway/commands/titlebar_padding.c @@ -14,8 +14,7 @@ struct cmd_results *cmd_titlebar_padding(int argc, char **argv) { char *inv; int h_value = strtol(argv[0], &inv, 10); if (*inv != '\0' || h_value < 0 || h_value < config->titlebar_border_thickness) { - return cmd_results_new(CMD_FAILURE, "titlebar_padding", - "Invalid size specified"); + return cmd_results_new(CMD_FAILURE, "Invalid size specified"); } int v_value; @@ -24,8 +23,7 @@ struct cmd_results *cmd_titlebar_padding(int argc, char **argv) { } else { v_value = strtol(argv[1], &inv, 10); if (*inv != '\0' || v_value < 0 || v_value < config->titlebar_border_thickness) { - return cmd_results_new(CMD_FAILURE, "titlebar_padding", - "Invalid size specified"); + return cmd_results_new(CMD_FAILURE, "Invalid size specified"); } } @@ -38,5 +36,5 @@ struct cmd_results *cmd_titlebar_padding(int argc, char **argv) { output_damage_whole(output); } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3-54-g00ecf