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/input/events.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sway/commands/input/events.c') diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c index 69f46269..2c6505d8 100644 --- a/sway/commands/input/events.c +++ b/sway/commands/input/events.c @@ -71,8 +71,7 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { } struct input_config *ic = config->handler_context.input_config; if (!ic) { - return cmd_results_new(CMD_FAILURE, "events", - "No input device defined."); + return cmd_results_new(CMD_FAILURE, "No input device defined."); } if (strcasecmp(argv[0], "enabled") == 0) { @@ -83,7 +82,7 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { ic->send_events = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE; } else if (config->reading) { - return cmd_results_new(CMD_INVALID, "events", + return cmd_results_new(CMD_INVALID, "Expected 'events '"); } else if (strcasecmp(argv[0], "toggle") == 0) { if (strcmp(ic->identifier, "*") == 0) { @@ -97,10 +96,10 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { toggle_send_events(ic); } } else { - return cmd_results_new(CMD_INVALID, "events", + return cmd_results_new(CMD_INVALID, "Expected 'events '"); } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3