diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-01-05 21:39:59 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-01-05 21:39:59 +0100 |
| commit | 258cdffc2f9f8cd3d243bd19f507bc73009d77d9 (patch) | |
| tree | 5b0948b55c73c35011139f54a61b612def25a0f3 | |
| parent | 86b9b8e70d54e79db3ff4f67bbd5280ecfc82537 (diff) | |
journal: rename priority_prefix to level_prefix, since that's how we call it in PID 1
| -rw-r--r-- | src/journal/journald.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c index 22ac7d9a6..419ce26ad 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -65,7 +65,7 @@ typedef enum StdoutStreamState { STDOUT_STREAM_TAG, STDOUT_STREAM_PRIORITY, - STDOUT_STREAM_PRIORITY_PREFIX, + STDOUT_STREAM_LEVEL_PREFIX, STDOUT_STREAM_FORWARD_TO_SYSLOG, STDOUT_STREAM_FORWARD_TO_KMSG, STDOUT_STREAM_FORWARD_TO_CONSOLE, @@ -82,7 +82,7 @@ struct StdoutStream { char *tag; int priority; - bool priority_prefix:1; + bool level_prefix:1; bool forward_to_syslog:1; bool forward_to_kmsg:1; bool forward_to_console:1; @@ -1235,7 +1235,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p) { priority = s->priority; - if (s->priority_prefix) + if (s->level_prefix) parse_syslog_priority((char**) &p, &priority); if (s->forward_to_syslog || s->server->forward_to_syslog) @@ -1303,17 +1303,17 @@ static int stdout_stream_line(StdoutStream *s, char *p) { return -EINVAL; } - s->state = STDOUT_STREAM_PRIORITY_PREFIX; + s->state = STDOUT_STREAM_LEVEL_PREFIX; return 0; - case STDOUT_STREAM_PRIORITY_PREFIX: + case STDOUT_STREAM_LEVEL_PREFIX: r = parse_boolean(p); if (r < 0) { - log_warning("Failed to parse priority prefix line."); + log_warning("Failed to parse level prefix line."); return -EINVAL; } - s->priority_prefix = !!r; + s->level_prefix = !!r; s->state = STDOUT_STREAM_FORWARD_TO_SYSLOG; return 0; |