diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-03-01 10:37:33 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-03-01 11:26:52 +0100 |
| commit | 7966a9169018e75e666737af2b122f05feae8140 (patch) | |
| tree | 7ac4048a177f991b9c4a02765fda3e9c11ae84cb /src/core/execute.c | |
| parent | Skip TEST-50 on ubuntu ci (diff) | |
| download | systemd-7966a9169018e75e666737af2b122f05feae8140.tar.xz systemd-7966a9169018e75e666737af2b122f05feae8140.zip | |
core: change confusing parameter name
fixup_output() is used for both stdout and stderr.
Diffstat (limited to '')
| -rw-r--r-- | src/core/execute.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index de51eba11c..0d3fc1c0fc 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -446,12 +446,12 @@ static int fixup_input( return std_input; } -static int fixup_output(ExecOutput std_output, int socket_fd) { +static int fixup_output(ExecOutput output, int socket_fd) { - if (std_output == EXEC_OUTPUT_SOCKET && socket_fd < 0) + if (output == EXEC_OUTPUT_SOCKET && socket_fd < 0) return EXEC_OUTPUT_INHERIT; - return std_output; + return output; } static int setup_input( @@ -622,7 +622,7 @@ static int setup_output( o == EXEC_OUTPUT_INHERIT && i == EXEC_INPUT_NULL && !is_terminal_input(context->std_input) && - getppid () != 1) + getppid() != 1) return fileno; /* Duplicate from stdout if possible */ @@ -666,7 +666,8 @@ static int setup_output( case EXEC_OUTPUT_JOURNAL_AND_CONSOLE: r = connect_logger_as(unit, context, params, o, ident, fileno, uid, gid); if (r < 0) { - log_unit_warning_errno(unit, r, "Failed to connect %s to the journal socket, ignoring: %m", fileno == STDOUT_FILENO ? "stdout" : "stderr"); + log_unit_warning_errno(unit, r, "Failed to connect %s to the journal socket, ignoring: %m", + fileno == STDOUT_FILENO ? "stdout" : "stderr"); r = open_null_as(O_WRONLY, fileno); } else { struct stat st; |