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/rename.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'sway/commands/rename.c') diff --git a/sway/commands/rename.c b/sway/commands/rename.c index 491dbab0..a68302c4 100644 --- a/sway/commands/rename.c +++ b/sway/commands/rename.c @@ -10,7 +10,7 @@ #include "sway/tree/container.h" #include "sway/tree/workspace.h" -static const char* expected_syntax = +static const char expected_syntax[] = "Expected 'rename workspace to ' or " "'rename workspace to '"; @@ -20,11 +20,11 @@ struct cmd_results *cmd_rename(int argc, char **argv) { return error; } if (!root->outputs->length) { - return cmd_results_new(CMD_INVALID, "rename", + return cmd_results_new(CMD_INVALID, "Can't run this command while there's no outputs connected."); } if (strcasecmp(argv[0], "workspace") != 0) { - return cmd_results_new(CMD_INVALID, "rename", expected_syntax); + return cmd_results_new(CMD_INVALID, expected_syntax); } int argn = 1; @@ -36,7 +36,7 @@ struct cmd_results *cmd_rename(int argc, char **argv) { } else if (strcasecmp(argv[1], "number") == 0) { // 'rename workspace number x to new_name' if (!isdigit(argv[2][0])) { - return cmd_results_new(CMD_INVALID, "rename", + return cmd_results_new(CMD_INVALID, "Invalid workspace number '%s'", argv[2]); } workspace = workspace_by_number(argv[2]); @@ -56,14 +56,14 @@ struct cmd_results *cmd_rename(int argc, char **argv) { } if (!workspace) { - return cmd_results_new(CMD_INVALID, "rename", + return cmd_results_new(CMD_INVALID, "There is no workspace with that name"); } ++argn; // move past "to" if (argn >= argc) { - return cmd_results_new(CMD_INVALID, "rename", expected_syntax); + return cmd_results_new(CMD_INVALID, expected_syntax); } char *new_name = join_args(argv + argn, argc - argn); @@ -75,17 +75,16 @@ struct cmd_results *cmd_rename(int argc, char **argv) { strcasecmp(new_name, "current") == 0 || strcasecmp(new_name, "number") == 0) { free(new_name); - return cmd_results_new(CMD_INVALID, "rename", + return cmd_results_new(CMD_INVALID, "Cannot use special workspace name '%s'", argv[argn]); } struct sway_workspace *tmp_workspace = workspace_by_name(new_name); if (tmp_workspace) { free(new_name); if (tmp_workspace == workspace) { - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } else { - return cmd_results_new(CMD_INVALID, "rename", - "Workspace already exists"); + return cmd_results_new(CMD_INVALID, "Workspace already exists"); } } @@ -96,5 +95,5 @@ struct cmd_results *cmd_rename(int argc, char **argv) { output_sort_workspaces(workspace->output); ipc_event_workspace(NULL, workspace, "rename"); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } -- cgit v1.2.3