From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Jul 2025 10:15:47 +0000 (+0200)
Subject: machined: use RET_GATHER() more
X-Git-Tag: v258-rc1~55^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F38226%2Fhead;p=thirdparty%2Fsystemd.git

machined: use RET_GATHER() more
---

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 52fd69c6dac..46395d7df4a 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -198,15 +198,13 @@ static int manager_enumerate_machines(Manager *m) {
 
                 k = manager_add_machine(m, de->d_name, &machine);
                 if (k < 0) {
-                        r = log_error_errno(k, "Failed to add machine by file name %s: %m", de->d_name);
+                        RET_GATHER(r, log_error_errno(k, "Failed to add machine by file name %s: %m", de->d_name));
                         continue;
                 }
 
                 machine_add_to_gc_queue(machine);
 
-                k = machine_load(machine);
-                if (k < 0)
-                        r = k;
+                RET_GATHER(r, machine_load(machine));
         }
 
         return r;