diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-05-16 17:12:53 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-05-31 13:04:18 +0200 |
| commit | 9b972c9aab56292ac2934fd1942e1ba443a39df0 (patch) | |
| tree | ea91048e6be90d2e97248f01d78c19a9463e2318 | |
| parent | fd4885df947a23b8f40c08f08ac7f7d13a8abdf4 (diff) | |
| download | systemd-9b972c9aab56292ac2934fd1942e1ba443a39df0.tar.gz | |
journal: rename output_journal to show_journal_entry
We have show_journal, and output_journal, and it's not immediately clear
how they related. Rename the first to show that it just prints one entry.
| -rw-r--r-- | src/journal-remote/journal-gatewayd.c | 2 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 4 | ||||
| -rw-r--r-- | src/shared/logs-show.c | 4 | ||||
| -rw-r--r-- | src/shared/logs-show.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index c29b65764a..a2b7fd6bd9 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -214,7 +214,7 @@ static ssize_t request_reader_entries( return MHD_CONTENT_READER_END_WITH_ERROR; } - r = output_journal(m->tmp, m->journal, m->mode, 0, OUTPUT_FULL_WIDTH, + r = show_journal_entry(m->tmp, m->journal, m->mode, 0, OUTPUT_FULL_WIDTH, NULL, NULL, NULL); if (r < 0) { log_error_errno(r, "Failed to serialize item: %m"); diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 26222ea28d..61d29986ce 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2619,8 +2619,8 @@ int main(int argc, char *argv[]) { arg_utc * OUTPUT_UTC | arg_no_hostname * OUTPUT_NO_HOSTNAME; - r = output_journal(stdout, j, arg_output, 0, flags, - arg_output_fields, highlight, &ellipsized); + r = show_journal_entry(stdout, j, arg_output, 0, flags, + arg_output_fields, highlight, &ellipsized); need_seek = true; if (r == -EADDRNOTAVAIL) break; diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index af788391ad..e1d59209d7 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -1068,7 +1068,7 @@ static int (*output_funcs[_OUTPUT_MODE_MAX])( [OUTPUT_WITH_UNIT] = output_short, }; -int output_journal( +int show_journal_entry( FILE *f, sd_journal *j, OutputMode mode, @@ -1178,7 +1178,7 @@ static int show_journal(FILE *f, line++; maybe_print_begin_newline(f, &flags); - r = output_journal(f, j, mode, n_columns, flags, NULL, NULL, ellipsized); + r = show_journal_entry(f, j, mode, n_columns, flags, NULL, NULL, ellipsized); if (r < 0) return r; } diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h index 1a1874685c..49caa4cb39 100644 --- a/src/shared/logs-show.h +++ b/src/shared/logs-show.h @@ -19,7 +19,7 @@ #include "time-util.h" #include "util.h" -int output_journal( +int show_journal_entry( FILE *f, sd_journal *j, OutputMode mode, |