diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-05-16 11:29:49 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-05-16 16:37:31 +0900 |
commit | 5668f3a7cfccca704ea8e8bdc84ca7e17a5f101e (patch) | |
tree | 85d1c9ec78c25bfd65e4b7db4b7d58e16953ad39 /src/udev/udev-builtin-usb_id.c | |
parent | b3cfe5900108df81fbf547b297d51ac8c7359a9b (diff) | |
download | systemd-5668f3a7cfccca704ea8e8bdc84ca7e17a5f101e.tar.gz |
udev: make udev_builtin_run() take UdevEvent*
No functional change, preparation for later commits.
Diffstat (limited to 'src/udev/udev-builtin-usb_id.c')
-rw-r--r-- | src/udev/udev-builtin-usb_id.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c index 91deb64292..8e83c9c342 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/udev/udev-builtin-usb_id.c @@ -224,7 +224,8 @@ static int dev_if_packed_info(sd_device *dev, char *ifs_str, size_t len) { * 6.) If the device supplies a serial number, this number * is concatenated with the identification with an underscore '_'. */ -static int builtin_usb_id(sd_device *dev, sd_netlink **rtnl, int argc, char *argv[], bool test) { +static int builtin_usb_id(UdevEvent *event, int argc, char *argv[], bool test) { + sd_device *dev = ASSERT_PTR(ASSERT_PTR(event)->dev); char vendor_str[64] = ""; char vendor_str_enc[256]; const char *vendor_id; @@ -250,8 +251,6 @@ static int builtin_usb_id(sd_device *dev, sd_netlink **rtnl, int argc, char *arg const char *syspath, *sysname, *devtype, *interface_syspath; int r; - assert(dev); - r = sd_device_get_syspath(dev, &syspath); if (r < 0) return r; |