diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-14 11:44:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 11:44:18 -0500 |
| commit | 15cd8b6a86295a445a1037afd0028b1226a14c82 (patch) | |
| tree | 56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/exec_always.c | |
| parent | 64ef9366733d6d332a24897f72eba90ba2adca1e (diff) | |
| parent | 2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (diff) | |
Merge pull request #3403 from mstoeckl/ipcleanup
Remove 'input' field of IPC command return json
Diffstat (limited to 'sway/commands/exec_always.c')
| -rw-r--r-- | sway/commands/exec_always.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 9ec28d81..1ed6c7e6 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -15,7 +15,9 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { struct cmd_results *error = NULL; - if (!config->active || config->validating) return cmd_results_new(CMD_DEFER, NULL, NULL); + if (!config->active || config->validating) { + return cmd_results_new(CMD_DEFER, NULL); + } if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) { return error; } @@ -71,7 +73,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { } else if (pid < 0) { close(fd[0]); close(fd[1]); - return cmd_results_new(CMD_FAILURE, argv[-1], "fork() failed"); + return cmd_results_new(CMD_FAILURE, "fork() failed"); } close(fd[1]); // close write ssize_t s = 0; @@ -85,9 +87,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { wlr_log(WLR_DEBUG, "Child process created with pid %d", child); root_record_workspace_pid(child); } else { - return cmd_results_new(CMD_FAILURE, argv[-1], - "Second fork() failed"); + return cmd_results_new(CMD_FAILURE, "Second fork() failed"); } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } |