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

logs-show: use sd_journal_step_one()

Browse Source
This commit is contained in:
Yu Watanabe
2023-09-26 13:26:22 +09:00
parent 8081939d1d
commit 0141b2143d
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/logs-show.c
+4 -10
View File
@@ -1852,13 +1852,10 @@ static int discover_next_boot(
sd_journal_flush_matches(j);
do {
if (advance_older)
r = sd_journal_previous(j);
else
r = sd_journal_next(j);
r = sd_journal_step_one(j, !advance_older);
if (r < 0)
return r;
else if (r == 0) {
if (r == 0) {
*ret = (BootId) {};
return 0; /* End of journal, yay. */
}
@@ -1893,13 +1890,10 @@ static int discover_next_boot(
if (r < 0)
return r;
if (advance_older)
r = sd_journal_next(j);
else
r = sd_journal_previous(j);
r = sd_journal_step_one(j, advance_older);
if (r < 0)
return r;
else if (r == 0)
if (r == 0)
return log_debug_errno(SYNTHETIC_ERRNO(ENODATA),
"Whoopsie! We found a boot ID but can't read its last entry."); /* This shouldn't happen. We just came from this very boot ID. */