From 6d392150a72ecc3b69fcfb48865f625e2c7b79d6 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Thu, 10 Jan 2019 08:27:52 -0500 Subject: Remove 'input' field of IPC command return json This field is not in i3 and provides imprecise and redundant information. (Specifically, when swaymsg is given a list of commands, the IPC return array already indicates precisely which number command failed; knowing the name of the command is not useful when multiple commands of the same type are provided.) --- sway/commands.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'sway/commands.c') diff --git a/sway/commands.c b/sway/commands.c index 1d190e0b..9fae6a35 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -316,7 +316,7 @@ cleanup: // be chained together) // 4) execute_command handles all state internally while config_command has // some state handled outside (notably the block mode, in read_config) -struct cmd_results *config_command(char *exec) { +struct cmd_results *config_command(char *exec, char **new_block) { struct cmd_results *results = NULL; int argc; char **argv = split_args(exec, &argc); @@ -329,9 +329,8 @@ struct cmd_results *config_command(char *exec) { // Check for the start of a block if (argc > 1 && strcmp(argv[argc - 1], "{") == 0) { - char *block = join_args(argv, argc - 1); - results = cmd_results_new(CMD_BLOCK, block, NULL); - free(block); + *new_block = join_args(argv, argc - 1); + results = cmd_results_new(CMD_BLOCK, NULL, NULL); goto cleanup; } @@ -509,11 +508,7 @@ struct cmd_results *cmd_results_new(enum cmd_status status, return NULL; } results->status = status; - if (input) { - results->input = strdup(input); // input is the command name - } else { - results->input = NULL; - } + // NOTE: `input` argument is unused, remove if (format) { char *error = malloc(256); va_list args; @@ -530,9 +525,6 @@ struct cmd_results *cmd_results_new(enum cmd_status status, } void free_cmd_results(struct cmd_results *results) { - if (results->input) { - free(results->input); - } if (results->error) { free(results->error); } @@ -552,10 +544,6 @@ char *cmd_results_to_json(list_t *res_list) { json_object_object_add( root, "error", json_object_new_string(results->error)); } - if (results->input) { - json_object_object_add( - root, "input", json_object_new_string(results->input)); - } json_object_array_add(result_array, root); } const char *json = json_object_to_json_string(result_array); -- cgit v1.2.3