analyze: use RET_GATHER()

diff --git a/src/analyze/analyze-calendar.c b/src/analyze/analyze-calendar.c
index 6daab0844367ce814c0c38073328993954288186..b3afa1d4b0cd4abe2209764a39bfb0be3dd95389 100644 (file)
--- 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 97de4387aba650882799ed0066b3d2e5641fd5bd..8c96a8ec55ddec465522c517158369cae9b17bb9 100644 (file)
--- 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');