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

sd-device: use structured initializers

This commit is contained in:
Yu Watanabe 2018-08-27 14:07:01 +09:00
parent 1c71f7f329
commit 6116d2b275
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd/sd-device/device-enumerator.c
View File

@ -45,12 +45,14 @@ _public_ int sd_device_enumerator_new(sd_device_enumerator **ret) {
assert(ret);
enumerator = new0(sd_device_enumerator, 1);
enumerator = new(sd_device_enumerator, 1);
if (!enumerator)
return -ENOMEM;
enumerator->n_ref = 1;
enumerator->type = _DEVICE_ENUMERATION_TYPE_INVALID;
*enumerator = (sd_device_enumerator) {
.n_ref = 1,
.type = _DEVICE_ENUMERATION_TYPE_INVALID,
};
*ret = TAKE_PTR(enumerator);

9
src/libsystemd/sd-device/sd-device.c
View File

@ -31,15 +31,16 @@ int device_new_aux(sd_device **ret) {
assert(ret);
device = new0(sd_device, 1);
device = new(sd_device, 1);
if (!device)
return -ENOMEM;
device->n_ref = 1;
device->watch_handle = -1;
*device = (sd_device) {
.n_ref = 1,
.watch_handle = -1,
};
*ret = device;
return 0;
}