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.

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index c29b65764af7b9370a1d299c9dc4f8ea64434b08..a2b7fd6bd97a3c73a3d5f76cff6620037abbd62e 100644 (file)
--- 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 26222ea28d4ca5213b5687bba8e37004f3e3ff7c..61d29986ce8d6a88c3ff3bf1139ca96e0e0eb226 100644 (file)
--- 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 af788391ad5b5c4a1b359c284a206885f3ed2986..e1d59209d7b4a8a84dd933468954c718e6742fa3 100644 (file)
--- 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 1a1874685c41f9c96c88180c3a3d020514e85df5..49caa4cb399f4a6b3985605183bdf7624db2cc5e 100644 (file)
--- 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,