summaryrefslogtreecommitdiff
path: root/src/udev/udev-ctrl.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-08-22 19:57:32 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-09-10 18:27:36 +0900
commit2024ed616e91964ceadbb8c2ef460cd499018833 (patch)
tree90bf70d20a820f5219d94bb4d9aefd7795a49588 /src/udev/udev-ctrl.c
parent187e1d977ab330918859e5cec0f814bd7752118d (diff)
downloadsystemd-2024ed616e91964ceadbb8c2ef460cd499018833.tar.gz
udev: drop unused udev struct
Diffstat (limited to 'src/udev/udev-ctrl.c')
-rw-r--r--src/udev/udev-ctrl.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 420e841764..0f2aa33512 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -56,7 +56,6 @@ struct udev_ctrl_msg {
struct udev_ctrl {
int refcount;
- struct udev *udev;
int sock;
union sockaddr_union saddr;
socklen_t addrlen;
@@ -71,7 +70,7 @@ struct udev_ctrl_connection {
int sock;
};
-struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd) {
+struct udev_ctrl *udev_ctrl_new_from_fd(int fd) {
struct udev_ctrl *uctrl;
const int on = 1;
int r;
@@ -80,7 +79,6 @@ struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd) {
if (uctrl == NULL)
return NULL;
uctrl->refcount = 1;
- uctrl->udev = udev;
if (fd < 0) {
uctrl->sock = socket(AF_LOCAL, SOCK_SEQPACKET|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
@@ -108,8 +106,8 @@ struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd) {
return uctrl;
}
-struct udev_ctrl *udev_ctrl_new(struct udev *udev) {
- return udev_ctrl_new_from_fd(udev, -1);
+struct udev_ctrl *udev_ctrl_new(void) {
+ return udev_ctrl_new_from_fd(-1);
}
int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl) {
@@ -135,10 +133,6 @@ int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl) {
return 0;
}
-struct udev *udev_ctrl_get_udev(struct udev_ctrl *uctrl) {
- return uctrl->udev;
-}
-
static struct udev_ctrl *udev_ctrl_ref(struct udev_ctrl *uctrl) {
if (uctrl)
uctrl->refcount++;