From: Tom Gundersen Date: Mon, 11 May 2015 20:17:49 +0000 (+0200) Subject: udevd: make udev_ctrl_connection global X-Git-Tag: v226.4~1^2~395 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=625299542476ecfbfc3a0452e2efe9a997aaf787;hp=196a94b7ab76f78e662b31b63bf92f50fd521663;p=elogind.git udevd: make udev_ctrl_connection global This allows us to simplify the ctrl_msg handler. Eventually all this global state should move to a Manager object or so. --- diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h index a729bceaa..5a3b9cfc1 100644 --- a/src/shared/udev-util.h +++ b/src/shared/udev-util.h @@ -27,10 +27,14 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_device*, udev_device_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_enumerate*, udev_enumerate_unref); +DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_connection*, udev_ctrl_connection_unref); +DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_msg*, udev_ctrl_msg_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_monitor*, udev_monitor_unref); #define _cleanup_udev_unref_ _cleanup_(udev_unrefp) #define _cleanup_udev_device_unref_ _cleanup_(udev_device_unrefp) #define _cleanup_udev_enumerate_unref_ _cleanup_(udev_enumerate_unrefp) +#define _cleanup_udev_ctrl_connection_unref_ _cleanup_(udev_ctrl_connection_unrefp) +#define _cleanup_udev_ctrl_msg_unref_ _cleanup_(udev_ctrl_msg_unrefp) #define _cleanup_udev_monitor_unref_ _cleanup_(udev_monitor_unrefp) #define _cleanup_udev_list_cleanup_ _cleanup_(udev_list_cleanup)