picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Tom Gundersen 2015-04-03 21:05:42 +02:00
parent 2fe29a46a3
commit aa20f49a1c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libsystemd/sd-device/device-private.c
View file

@ -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;