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. --- include/sway/commands.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include/sway/commands.h') diff --git a/include/sway/commands.h b/include/sway/commands.h index 757cc817..657f909e 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -75,7 +75,7 @@ struct cmd_results *config_commands_command(char *exec); /** * Allocates a cmd_results object. */ -struct cmd_results *cmd_results_new(enum cmd_status status, const char* input, const char *error, ...); +struct cmd_results *cmd_results_new(enum cmd_status status, const char *error, ...); /** * Frees a cmd_results object. */ @@ -87,8 +87,7 @@ void free_cmd_results(struct cmd_results *results); */ char *cmd_results_to_json(list_t *res_list); -struct cmd_results *add_color(const char *name, - char *buffer, const char *color); +struct cmd_results *add_color(char *buffer, const char *color); /** * TODO: Move this function and its dependent functions to container.c. -- cgit v1.2.3-54-g00ecf