From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 23 Sep 2023 18:31:14 +0000 (+0900)
Subject: logs-show: use sd_journal_step_one()
X-Git-Tag: v255-rc1~414^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0141b2143d5a5e5fda154157f6a455d371ba52ab;p=thirdparty%2Fsystemd.git

logs-show: use sd_journal_step_one()
---

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 6cd376b0a11..0130e747bf4 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -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. */