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/set.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sway/commands/set.c') diff --git a/sway/commands/set.c b/sway/commands/set.c index d912e4fd..c539e9fc 100644 --- a/sway/commands/set.c +++ b/sway/commands/set.c @@ -31,7 +31,7 @@ struct cmd_results *cmd_set(int argc, char **argv) { } if (argv[0][0] != '$') { - return cmd_results_new(CMD_INVALID, "set", "variable '%s' must start with $", argv[0]); + return cmd_results_new(CMD_INVALID, "variable '%s' must start with $", argv[0]); } struct sway_variable *var = NULL; @@ -49,12 +49,12 @@ struct cmd_results *cmd_set(int argc, char **argv) { } else { var = malloc(sizeof(struct sway_variable)); if (!var) { - return cmd_results_new(CMD_FAILURE, "set", "Unable to allocate variable"); + return cmd_results_new(CMD_FAILURE, "Unable to allocate variable"); } var->name = strdup(argv[0]); list_add(config->symbols, var); list_qsort(config->symbols, compare_set_qsort); } var->value = join_args(argv + 1, argc - 1); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3