projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2fe29a4
)
sd-device: get_properties_{nulstr,strv} - don't recreate the buffer unnecessarily
author
Tom Gundersen
<teg@jklm.no>
Fri, 3 Apr 2015 19:05:42 +0000
(21:05 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Fri, 3 Apr 2015 20:17:41 +0000
(22:17 +0200)
src/libsystemd/sd-device/device-private.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-device/device-private.c
b/src/libsystemd/sd-device/device-private.c
index
81b0b6d
..
2add6bb
100644
(file)
--- 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;