]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
machined: use RET_GATHER() more 38226/head
authorLennart Poettering <lennart@poettering.net>
Tue, 15 Jul 2025 10:15:47 +0000 (12:15 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 15 Jul 2025 11:09:08 +0000 (13:09 +0200)
src/machine/machined.c

index 52fd69c6dac77313dd365d484bedbbc8194ba103..46395d7df4a90774fcc5bc69efa71cc750717dd4 100644 (file)
@@ -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;