From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 11 Jul 2025 03:04:28 +0000 (+0900)
Subject: sd-device: do not set errno needlessly
X-Git-Tag: v258-rc1~95^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5287e7efd03166c00114d5b4c7f142515b3c90a;p=thirdparty%2Fsystemd.git

sd-device: do not set errno needlessly
---

diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index 850eff9d028..8c6a1a09187 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -2219,17 +2219,12 @@ static int device_sysattrs_read_all(sd_device *device) {
 
 _public_ const char *sd_device_get_sysattr_first(sd_device *device) {
         void *v;
-        int r;
 
         assert_return(device, NULL);
 
-        if (!device->sysattrs_read) {
-                r = device_sysattrs_read_all(device);
-                if (r < 0) {
-                        errno = -r;
-                        return NULL;
-                }
-        }
+        if (!device->sysattrs_read &&
+            device_sysattrs_read_all(device) < 0)
+                return NULL;
 
         device->sysattrs_iterator = ITERATOR_FIRST;