From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 27 May 2025 18:20:16 +0000 (+0900)
Subject: udevadm-info: use RET_GATHER() at one more place
X-Git-Tag: v258-rc1~425^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=337f45d811bd17e3907d930521143da53e460c2e;p=thirdparty%2Fsystemd.git

udevadm-info: use RET_GATHER() at one more place
---

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 45c39d4c732..a9e99ef7e50 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -1276,7 +1276,7 @@ static int parse_argv(int argc, char *argv[]) {
 }
 
 int info_main(int argc, char *argv[], void *userdata) {
-        int r, ret;
+        int r;
 
         r = parse_argv(argc, argv);
         if (r <= 0)
@@ -1298,7 +1298,7 @@ int info_main(int argc, char *argv[], void *userdata) {
                 return print_tree(NULL);
         }
 
-        ret = 0;
+        int ret = 0;
         STRV_FOREACH(p, arg_devices) {
                 _cleanup_(sd_device_unrefp) sd_device *device = NULL;
 
@@ -1309,8 +1309,7 @@ int info_main(int argc, char *argv[], void *userdata) {
                         else
                                 log_error_errno(r, "Unknown device \"%s\": %m",  *p);
 
-                        if (ret == 0)
-                                ret = r;
+                        RET_GATHER(ret, r);
                         continue;
                 }