diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c index 7e0d313a08..9f7783e86c 100644 --- a/src/libsystemd/sd-device/device-enumerator.c +++ b/src/libsystemd/sd-device/device-enumerator.c @@ -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); diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 1d3999acbd..c61e98fe72 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -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; }