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

journalctl: use correct type for flags

Browse Source 
This also moves its declaration, as it is not changed in the loop.
This commit is contained in:
Yu Watanabe
2024-03-26 22:21:13 +09:00
parent dc586975b2
commit adc8a60b88
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journalctl.c
+9 -10
View File
@@ -2088,8 +2088,16 @@ static int show(Context *c) {
j = ASSERT_PTR(c->journal);
OutputFlags flags =
arg_all * OUTPUT_SHOW_ALL |
arg_full * OUTPUT_FULL_WIDTH |
colors_enabled() * OUTPUT_COLOR |
arg_catalog * OUTPUT_CATALOG |
arg_utc * OUTPUT_UTC |
arg_truncate_newline * OUTPUT_TRUNCATE_NEWLINE |
arg_no_hostname * OUTPUT_NO_HOSTNAME;
while (arg_lines < 0 || n_shown < arg_lines || arg_follow) {
int flags;
size_t highlight[2] = {};
if (c->need_seek) {
@@ -2180,15 +2188,6 @@ static int show(Context *c) {
}
}
flags =
arg_all * OUTPUT_SHOW_ALL |
arg_full * OUTPUT_FULL_WIDTH |
colors_enabled() * OUTPUT_COLOR |
arg_catalog * OUTPUT_CATALOG |
arg_utc * OUTPUT_UTC |
arg_truncate_newline * OUTPUT_TRUNCATE_NEWLINE |
arg_no_hostname * OUTPUT_NO_HOSTNAME;
r = show_journal_entry(stdout, j, arg_output, 0, flags,
arg_output_fields, highlight, &c->ellipsized,
&c->previous_ts_output, &c->previous_boot_id_output);