From ccae5a25c961d456a0b42da4bd8b0f8d39c530d9 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 3 Apr 2015 21:05:42 +0200 Subject: [PATCH] sd-device: get_properties_{nulstr,strv} - don't recreate the buffer unnecessarily --- src/libelogind/sd-device/device-private.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libelogind/sd-device/device-private.c b/src/libelogind/sd-device/device-private.c index f6beef849..544b837b1 100644 --- a/src/libelogind/sd-device/device-private.c +++ b/src/libelogind/sd-device/device-private.c @@ -641,6 +641,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; @@ -677,11 +680,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; -- 2.30.2