aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/set.c
diff options
context:
space:
mode:
authorLibravatar M Stoeckl <code@mstoeckl.com>2019-01-10 18:27:21 -0500
committerLibravatar M Stoeckl <code@mstoeckl.com>2019-01-14 08:05:29 -0500
commit2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (patch)
tree56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/set.c
parentRemove 'input' field of IPC command return json (diff)
downloadsway-2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0.tar.gz
sway-2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0.tar.zst
sway-2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0.zip
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.
Diffstat (limited to 'sway/commands/set.c')
-rw-r--r--sway/commands/set.c6
1 files changed, 3 insertions, 3 deletions
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) {
31 } 31 }
32 32
33 if (argv[0][0] != '$') { 33 if (argv[0][0] != '$') {
34 return cmd_results_new(CMD_INVALID, "set", "variable '%s' must start with $", argv[0]); 34 return cmd_results_new(CMD_INVALID, "variable '%s' must start with $", argv[0]);
35 } 35 }
36 36
37 struct sway_variable *var = NULL; 37 struct sway_variable *var = NULL;
@@ -49,12 +49,12 @@ struct cmd_results *cmd_set(int argc, char **argv) {
49 } else { 49 } else {
50 var = malloc(sizeof(struct sway_variable)); 50 var = malloc(sizeof(struct sway_variable));
51 if (!var) { 51 if (!var) {
52 return cmd_results_new(CMD_FAILURE, "set", "Unable to allocate variable"); 52 return cmd_results_new(CMD_FAILURE, "Unable to allocate variable");
53 } 53 }
54 var->name = strdup(argv[0]); 54 var->name = strdup(argv[0]);
55 list_add(config->symbols, var); 55 list_add(config->symbols, var);
56 list_qsort(config->symbols, compare_set_qsort); 56 list_qsort(config->symbols, compare_set_qsort);
57 } 57 }
58 var->value = join_args(argv + 1, argc - 1); 58 var->value = join_args(argv + 1, argc - 1);
59 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 59 return cmd_results_new(CMD_SUCCESS, NULL);
60} 60}