From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 8 Oct 2024 04:55:56 +0000 (+0900)
Subject: analyze: use RET_GATHER()
X-Git-Tag: v257-rc1~296^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=483db6867ac62db982c0035517c989b32e1da448;p=thirdparty%2Fsystemd.git

analyze: use RET_GATHER()
---

diff --git a/src/analyze/analyze-calendar.c b/src/analyze/analyze-calendar.c
index 6daab084436..b3afa1d4b0c 100644
--- a/src/analyze/analyze-calendar.c
+++ b/src/analyze/analyze-calendar.c
@@ -126,11 +126,7 @@ int verb_calendar(int argc, char *argv[], void *userdata) {
                 n = now(CLOCK_REALTIME); /* We want to use the same "base" for all expressions */
 
         STRV_FOREACH(p, strv_skip(argv, 1)) {
-                int k;
-
-                k = test_calendar_one(n, *p);
-                if (r == 0 && k < 0)
-                        r = k;
+                RET_GATHER(r, test_calendar_one(n, *p));
 
                 if (p[1])
                         putchar('\n');
diff --git a/src/analyze/analyze-timestamp.c b/src/analyze/analyze-timestamp.c
index 97de4387aba..8c96a8ec55d 100644
--- a/src/analyze/analyze-timestamp.c
+++ b/src/analyze/analyze-timestamp.c
@@ -76,11 +76,7 @@ int verb_timestamp(int argc, char *argv[], void *userdata) {
         int r = 0;
 
         STRV_FOREACH(p, strv_skip(argv, 1)) {
-                int k;
-
-                k = test_timestamp_one(*p);
-                if (r == 0 && k < 0)
-                        r = k;
+                RET_GATHER(r, test_timestamp_one(*p));
 
                 if (p[1])
                         putchar('\n');