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/gaps.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) (limited to 'sway/commands/gaps.c') diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c index faaeab37..021df843 100644 --- a/sway/commands/gaps.c +++ b/sway/commands/gaps.c @@ -43,7 +43,7 @@ static void prevent_invalid_outer_gaps(void) { } // gaps inner|outer|horizontal|vertical|top|right|bottom|left -static const char *expected_defaults = +static const char expected_defaults[] = "'gaps inner|outer|horizontal|vertical|top|right|bottom|left '"; static struct cmd_results *gaps_set_defaults(int argc, char **argv) { struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_EQUAL_TO, 2); @@ -54,8 +54,7 @@ static struct cmd_results *gaps_set_defaults(int argc, char **argv) { char *end; int amount = strtol(argv[1], &end, 10); if (strlen(end) && strcasecmp(end, "px") != 0) { - return cmd_results_new(CMD_INVALID, "gaps", - "Expected %s", expected_defaults); + return cmd_results_new(CMD_INVALID, "Expected %s", expected_defaults); } bool valid = false; @@ -85,12 +84,11 @@ static struct cmd_results *gaps_set_defaults(int argc, char **argv) { } } if (!valid) { - return cmd_results_new(CMD_INVALID, "gaps", - "Expected %s", expected_defaults); + return cmd_results_new(CMD_INVALID, "Expected %s", expected_defaults); } prevent_invalid_outer_gaps(); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } static void apply_gaps_op(int *prop, enum gaps_op op, int amount) { @@ -136,7 +134,7 @@ static void configure_gaps(struct sway_workspace *ws, void *_data) { // gaps inner|outer|horizontal|vertical|top|right|bottom|left current|all // set|plus|minus -static const char *expected_runtime = "'gaps inner|outer|horizontal|vertical|" +static const char expected_runtime[] = "'gaps inner|outer|horizontal|vertical|" "top|right|bottom|left current|all set|plus|minus '"; static struct cmd_results *gaps_set_runtime(int argc, char **argv) { struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_EQUAL_TO, 4); @@ -144,7 +142,7 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) { return error; } if (!root->outputs->length) { - return cmd_results_new(CMD_INVALID, "gaps", + return cmd_results_new(CMD_INVALID, "Can't run this command while there's no outputs connected."); } @@ -164,8 +162,7 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) { } if (!data.inner && !data.outer.top && !data.outer.right && !data.outer.bottom && !data.outer.left) { - return cmd_results_new(CMD_INVALID, "gaps", - "Expected %s", expected_runtime); + return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime); } bool all; @@ -174,8 +171,7 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) { } else if (strcasecmp(argv[1], "all") == 0) { all = true; } else { - return cmd_results_new(CMD_INVALID, "gaps", - "Expected %s", expected_runtime); + return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime); } if (strcasecmp(argv[2], "set") == 0) { @@ -185,15 +181,13 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) { } else if (strcasecmp(argv[2], "minus") == 0) { data.operation = GAPS_OP_SUBTRACT; } else { - return cmd_results_new(CMD_INVALID, "gaps", - "Expected %s", expected_runtime); + return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime); } char *end; data.amount = strtol(argv[3], &end, 10); if (strlen(end) && strcasecmp(end, "px") != 0) { - return cmd_results_new(CMD_INVALID, "gaps", - "Expected %s", expected_runtime); + return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime); } if (all) { @@ -202,7 +196,7 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) { configure_gaps(config->handler_context.workspace, &data); } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } // gaps inner|outer|| - sets defaults for workspaces @@ -224,9 +218,8 @@ struct cmd_results *cmd_gaps(int argc, char **argv) { return gaps_set_runtime(argc, argv); } if (config_loading) { - return cmd_results_new(CMD_INVALID, "gaps", - "Expected %s", expected_defaults); + return cmd_results_new(CMD_INVALID, "Expected %s", expected_defaults); } - return cmd_results_new(CMD_INVALID, "gaps", - "Expected %s or %s", expected_runtime, expected_defaults); + return cmd_results_new(CMD_INVALID, "Expected %s or %s", + expected_runtime, expected_defaults); } -- cgit v1.2.3