summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libudev/libudev-device.c8
-rw-r--r--src/libudev/libudev-enumerate.c2
-rw-r--r--src/libudev/libudev-hwdb.c2
-rw-r--r--src/libudev/libudev-list-internal.h3
-rw-r--r--src/libudev/libudev-list.c3
5 files changed, 8 insertions, 10 deletions
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 37828b2f09..5a2abf55e1 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -206,10 +206,10 @@ struct udev_device *udev_device_new(struct udev *udev, sd_device *device) {
.device = sd_device_ref(device),
};
- udev_list_init(udev, &udev_device->properties, true);
- udev_list_init(udev, &udev_device->tags, true);
- udev_list_init(udev, &udev_device->sysattrs, true);
- udev_list_init(udev, &udev_device->devlinks, true);
+ udev_list_init(&udev_device->properties, true);
+ udev_list_init(&udev_device->tags, true);
+ udev_list_init(&udev_device->sysattrs, true);
+ udev_list_init(&udev_device->devlinks, true);
return udev_device;
}
diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index 41318d0a8d..5e663bf192 100644
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -77,7 +77,7 @@ _public_ struct udev_enumerate *udev_enumerate_new(struct udev *udev) {
.enumerator = TAKE_PTR(e),
};
- udev_list_init(udev, &udev_enumerate->devices_list, false);
+ udev_list_init(&udev_enumerate->devices_list, false);
return udev_enumerate;
}
diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
index 2dd0a8b484..65b98c04d0 100644
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
@@ -56,7 +56,7 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) {
.hwdb = TAKE_PTR(hwdb_internal),
};
- udev_list_init(udev, &hwdb->properties_list, true);
+ udev_list_init(&hwdb->properties_list, true);
return hwdb;
}
diff --git a/src/libudev/libudev-list-internal.h b/src/libudev/libudev-list-internal.h
index 462a939178..4e1632c78d 100644
--- a/src/libudev/libudev-list-internal.h
+++ b/src/libudev/libudev-list-internal.h
@@ -8,7 +8,6 @@ struct udev_list_node {
};
struct udev_list {
- struct udev *udev;
struct udev_list_node node;
struct udev_list_entry **entries;
unsigned entries_cur;
@@ -16,7 +15,7 @@ struct udev_list {
bool unique;
};
-void udev_list_init(struct udev *udev, struct udev_list *list, bool unique);
+void udev_list_init(struct udev_list *list, bool unique);
void udev_list_cleanup(struct udev_list *list);
struct udev_list_entry *udev_list_get_entry(struct udev_list *list);
struct udev_list_entry *udev_list_entry_add(struct udev_list *list, const char *name, const char *value);
diff --git a/src/libudev/libudev-list.c b/src/libudev/libudev-list.c
index cabf7fe6dc..5f6726c2d8 100644
--- a/src/libudev/libudev-list.c
+++ b/src/libudev/libudev-list.c
@@ -65,9 +65,8 @@ static inline struct udev_list_entry *list_node_to_entry(struct udev_list_node *
return container_of(node, struct udev_list_entry, node);
}
-void udev_list_init(struct udev *udev, struct udev_list *list, bool unique) {
+void udev_list_init(struct udev_list *list, bool unique) {
memzero(list, sizeof(struct udev_list));
- list->udev = udev;
list->unique = unique;
udev_list_node_init(&list->node);
}