diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-11-16 11:44:17 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-11-20 14:38:35 +0900 |
| commit | 5ea78a39e5894297d59ea75b30e250d24bbfc6aa (patch) | |
| tree | 585f73773786df0c3cbd13fd62d3516bee26a674 /src/libudev/libudev-monitor.c | |
| parent | 170e4380b60cd7911fe72d62ca78445c917967cb (diff) | |
| download | systemd-5ea78a39e5894297d59ea75b30e250d24bbfc6aa.tar.gz | |
libudev-list: move libudev-list related definitions to libudev-list-internal.h
This also rename libudev-private.h to libudev-util.h, and cleanups
several unnecessary headers from udev.h and libudev-util.h
Diffstat (limited to 'src/libudev/libudev-monitor.c')
| -rw-r--r-- | src/libudev/libudev-monitor.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c index 5d64dab193..364ec09617 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -10,7 +10,6 @@ #include "device-private.h" #include "device-util.h" #include "libudev-device-internal.h" -#include "libudev-private.h" #include "string-util.h" /** @@ -65,7 +64,7 @@ static MonitorNetlinkGroup monitor_netlink_group_from_string(const char *name) { **/ _public_ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, const char *name) { _cleanup_(sd_device_monitor_unrefp) sd_device_monitor *m = NULL; - _cleanup_(udev_monitor_unrefp) struct udev_monitor *udev_monitor = NULL; + struct udev_monitor *udev_monitor; MonitorNetlinkGroup g; int r; @@ -93,7 +92,7 @@ _public_ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, c .monitor = TAKE_PTR(m), }; - return TAKE_PTR(udev_monitor); + return udev_monitor; } /** |