SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal: rename output_journal to show_journal_entry

Browse Source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-05-31 13:04:18 +02:00
parent fd4885df94
commit 9b972c9aab
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal-remote/journal-gatewayd.c
+1 -1
View File
@@ -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");
src/journal/journalctl.c
+2 -2
View File
@@ -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;
src/shared/logs-show.c
+2 -2
View File
@@ -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;
}
src/shared/logs-show.h
+1 -1
View File
@@ -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,