From: Tom Gundersen <teg@jklm.no>
Date: Fri, 3 Apr 2015 19:05:42 +0000 (+0200)
Subject: sd-device: get_properties_{nulstr,strv} - don't recreate the buffer unnecessarily
X-Git-Tag: v220~594
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa20f49a1c5816e6e7e97f2e2ba209be47f3c0a3;p=thirdparty%2Fsystemd.git

sd-device: get_properties_{nulstr,strv} - don't recreate the buffer unnecessarily
---

diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index 81b0b6dde68..2add6bb0de0 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -643,6 +643,9 @@ static int device_update_properties_bufs(sd_device *device) {
 
         assert(device);
 
+        if (!device->properties_buf_outdated)
+                return 0;
+
         FOREACH_DEVICE_PROPERTY(device, prop, val) {
                 size_t len = 0;
 
@@ -679,11 +682,9 @@ int device_get_properties_nulstr(sd_device *device, const uint8_t **nulstr, size
         assert(nulstr);
         assert(len);
 
-        if (device->properties_buf_outdated) {
-                r = device_update_properties_bufs(device);
-                if (r < 0)
-                        return r;
-        }
+        r = device_update_properties_bufs(device);
+        if (r < 0)
+                return r;
 
         *nulstr = device->properties_nulstr;
         *len = device->properties_nulstr_len;