dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-19 05:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

libudev-enumerate: use structured initializer

Browse Source
This commit is contained in:
Yu Watanabe
2018-08-24 14:09:17 +09:00
parent 2b19953a0d
commit 60fdee32bd
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/libudev/libudev-enumerate.c
View File

@@ -49,33 +49,37 @@ struct udev_enumerate {
* Returns: an enumeration context.
**/
_public_ struct udev_enumerate *udev_enumerate_new(struct udev *udev) {
_cleanup_free_ struct udev_enumerate *udev_enumerate = NULL;
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
struct udev_enumerate *udev_enumerate;
int r;
udev_enumerate = new0(struct udev_enumerate, 1);
r = sd_device_enumerator_new(&e);
if (r < 0) {
errno = -r;
return NULL;
}
r = sd_device_enumerator_allow_uninitialized(e);
if (r < 0) {
errno = -r;
return NULL;
}
udev_enumerate = new(struct udev_enumerate, 1);
if (!udev_enumerate) {
errno = ENOMEM;
return NULL;
}
r = sd_device_enumerator_new(&udev_enumerate->enumerator);
if (r < 0) {
errno = -r;
return NULL;
}
r = sd_device_enumerator_allow_uninitialized(udev_enumerate->enumerator);
if (r < 0) {
errno = -r;
return NULL;
}
udev_enumerate->n_ref = 1;
udev_enumerate->udev = udev;
*udev_enumerate = (struct udev_enumerate) {
.udev = udev,
.n_ref = 1,
.enumerator = TAKE_PTR(e),
};
udev_list_init(udev, &udev_enumerate->devices_list, false);
return TAKE_PTR(udev_enumerate);
return udev_enumerate;
}
static struct udev_enumerate *udev_enumerate_free(struct udev_enumerate *udev_enumerate) {