diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-05-19 21:49:03 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-05-19 21:49:03 +0200 |
| commit | 9a6bca7aada334cdcf10ae8e526de1f7f581da4f (patch) | |
| tree | df022d21dfb094e9e1b03a2aeec2a0abd563e918 /src | |
| parent | 88481092675c24e179d6047d70008172000217ec (diff) | |
execute: s/EXEC_OUTPUT_KERNEL/EXEC_OUTPUT_KMSG/ to follow LOG_TARGET_xxx nomenclature
Diffstat (limited to 'src')
| -rw-r--r-- | src/execute.c | 12 | ||||
| -rw-r--r-- | src/execute.h | 2 | ||||
| -rw-r--r-- | src/unit.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/execute.c b/src/execute.c index 37b2f8412c..d899a543f4 100644 --- a/src/execute.c +++ b/src/execute.c @@ -189,7 +189,7 @@ static int connect_logger_as(const ExecContext *context, ExecOutput output, cons "%i\n" "%s\n" "%i\n", - output == EXEC_OUTPUT_KERNEL ? "kmsg" : "syslog", + output == EXEC_OUTPUT_KMSG ? "kmsg" : "syslog", context->syslog_priority, context->syslog_identifier ? context->syslog_identifier : ident, !context->syslog_no_prefix); @@ -328,7 +328,7 @@ static int setup_output(const ExecContext *context, int socket_fd, const char *i return open_terminal_as(tty_path(context), O_WRONLY, STDOUT_FILENO); case EXEC_OUTPUT_SYSLOG: - case EXEC_OUTPUT_KERNEL: + case EXEC_OUTPUT_KMSG: return connect_logger_as(context, o, ident, STDOUT_FILENO); case EXEC_OUTPUT_SOCKET: @@ -377,7 +377,7 @@ static int setup_error(const ExecContext *context, int socket_fd, const char *id return open_terminal_as(tty_path(context), O_WRONLY, STDERR_FILENO); case EXEC_OUTPUT_SYSLOG: - case EXEC_OUTPUT_KERNEL: + case EXEC_OUTPUT_KMSG: return connect_logger_as(context, e, ident, STDERR_FILENO); case EXEC_OUTPUT_SOCKET: @@ -1266,8 +1266,8 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) { "%sTTYPath: %s\n", prefix, c->tty_path); - if (c->std_output == EXEC_OUTPUT_SYSLOG || c->std_output == EXEC_OUTPUT_KERNEL || - c->std_error == EXEC_OUTPUT_SYSLOG || c->std_error == EXEC_OUTPUT_KERNEL) + if (c->std_output == EXEC_OUTPUT_SYSLOG || c->std_output == EXEC_OUTPUT_KMSG || + c->std_error == EXEC_OUTPUT_SYSLOG || c->std_error == EXEC_OUTPUT_KMSG) fprintf(f, "%sSyslogFacility: %s\n" "%sSyslogLevel: %s\n", @@ -1616,7 +1616,7 @@ static const char* const exec_output_table[_EXEC_OUTPUT_MAX] = { [EXEC_OUTPUT_NULL] = "null", [EXEC_OUTPUT_TTY] = "tty", [EXEC_OUTPUT_SYSLOG] = "syslog", - [EXEC_OUTPUT_KERNEL] = "kernel", + [EXEC_OUTPUT_KMSG] = "kmsg", [EXEC_OUTPUT_SOCKET] = "socket" }; diff --git a/src/execute.h b/src/execute.h index be73542d4b..d42e0ba9d9 100644 --- a/src/execute.h +++ b/src/execute.h @@ -56,7 +56,7 @@ typedef enum ExecOutput { EXEC_OUTPUT_NULL, EXEC_OUTPUT_TTY, EXEC_OUTPUT_SYSLOG, - EXEC_OUTPUT_KERNEL, + EXEC_OUTPUT_KMSG, EXEC_OUTPUT_SOCKET, _EXEC_OUTPUT_MAX, _EXEC_OUTPUT_INVALID = -1 diff --git a/src/unit.c b/src/unit.c index 374d2e1331..8f0b0773f1 100644 --- a/src/unit.c +++ b/src/unit.c @@ -534,7 +534,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) { assert(u); assert(c); - if (c->std_output != EXEC_OUTPUT_KERNEL && c->std_output != EXEC_OUTPUT_SYSLOG) + if (c->std_output != EXEC_OUTPUT_KMSG && c->std_output != EXEC_OUTPUT_SYSLOG) return 0; /* If syslog or kernel logging is requested, make sure our own |