summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-device/device-private.c
diff options
context:
space:
mode:
authorDaniel Lockyer <thisisdaniellockyer@gmail.com>2017-11-24 10:33:41 +0000
committerDaniel Lockyer <thisisdaniellockyer@gmail.com>2017-11-24 10:33:41 +0000
commitf9ecfd3bbed396d744373dd6c8876b7211eac594 (patch)
tree036c4d7498abc62984d3d1daf8e6eba080943da7 /src/libsystemd/sd-device/device-private.c
parent5fecf46d76b31eedb3132cd569cfb82295e132bc (diff)
downloadsystemd-f9ecfd3bbed396d744373dd6c8876b7211eac594.tar.gz
Replace free and reassignment with free_and_replace
Diffstat (limited to 'src/libsystemd/sd-device/device-private.c')
-rw-r--r--src/libsystemd/sd-device/device-private.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index 587908b190..424965ecd5 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -678,13 +678,9 @@ static int device_update_properties_bufs(sd_device *device) {
i++;
}
- free(device->properties_nulstr);
- device->properties_nulstr = buf_nulstr;
- buf_nulstr = NULL;
+ free_and_replace(device->properties_nulstr, buf_nulstr);
device->properties_nulstr_len = nulstr_len;
- free(device->properties_strv);
- device->properties_strv = buf_strv;
- buf_strv = NULL;
+ free_and_replace(device->properties_strv, buf_strv);
device->properties_buf_outdated = false;