libudev-list: drop unused udev argument from udev_list_init()

yuwata · yuwata · commit f349626bed92 · 2018-11-22T23:19:25.000+09:00
diff --git 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
@@ -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
@@ -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
@@ -8,15 +8,14 @@ struct udev_list_node {
 };
 
 struct udev_list {
-        struct udev *udev;
         struct udev_list_node node;
         struct udev_list_entry **entries;
         unsigned entries_cur;
         unsigned entries_max;
         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
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ _public_ struct udev_enumerate udev_enumerate_new(struct udev udev) {`
`77`	`77`	`.enumerator = TAKE_PTR(e),`
`78`	`78`	`};`
`79`	`79`
`80`		`- udev_list_init(udev, &udev_enumerate->devices_list, false);`
	`80`	`+ udev_list_init(&udev_enumerate->devices_list, false);`
`81`	`81`
`82`	`82`	`return udev_enumerate;`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ _public_ struct udev_hwdb udev_hwdb_new(struct udev udev) {`
`56`	`56`	`.hwdb = TAKE_PTR(hwdb_internal),`
`57`	`57`	`};`
`58`	`58`
`59`		`- udev_list_init(udev, &hwdb->properties_list, true);`
	`59`	`+ udev_list_init(&hwdb->properties_list, true);`
`60`	`60`
`61`	`61`	`return hwdb;`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,8 @@ static inline struct udev_list_entry list_node_to_entry(struct udev_list_node `
`65`	`65`	`return container_of(node, struct udev_list_entry, node);`
`66`	`66`	`}`
`67`	`67`
`68`		`-void udev_list_init(struct udev udev, struct udev_list list, bool unique) {`
	`68`	`+void udev_list_init(struct udev_list *list, bool unique) {`
`69`	`69`	`memzero(list, sizeof(struct udev_list));`
`70`		`- list->udev = udev;`
`71`	`70`	`list->unique = unique;`
`72`	`71`	`udev_list_node_init(&list->node);`
`73`	`72`	`}`