diff options
| author | Ron Yorston <rmy@pobox.com> | 2025-08-15 09:00:13 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2025-08-15 09:00:13 +0100 |
| commit | 01ff9c492111cf7d51ad074629d6e72bc69fc149 (patch) | |
| tree | 394973e4e5f25dcd638185be75b84430c39ebab2 /util-linux | |
| parent | 9a2d9345377d38c428df6d3e0887956d359807ab (diff) | |
| parent | 8bde71eb1502a5cdf186769b47d470038f99bc95 (diff) | |
| download | busybox-w32-01ff9c492111cf7d51ad074629d6e72bc69fc149.tar.gz busybox-w32-01ff9c492111cf7d51ad074629d6e72bc69fc149.tar.bz2 busybox-w32-01ff9c492111cf7d51ad074629d6e72bc69fc149.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/lspci.c | 2 | ||||
| -rw-r--r-- | util-linux/lsusb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/lspci.c b/util-linux/lspci.c index b38b46be3..25be23a01 100644 --- a/util-linux/lspci.c +++ b/util-linux/lspci.c | |||
| @@ -47,7 +47,7 @@ static int FAST_FUNC fileAction(struct recursive_state *state UNUSED_PARAM, | |||
| 47 | int pci_class = 0, pci_vid = 0, pci_did = 0; | 47 | int pci_class = 0, pci_vid = 0, pci_did = 0; |
| 48 | int pci_subsys_vid = 0, pci_subsys_did = 0; | 48 | int pci_subsys_vid = 0, pci_subsys_did = 0; |
| 49 | 49 | ||
| 50 | char *uevent_filename = concat_path_file(fileName, "/uevent"); | 50 | char *uevent_filename = concat_path_file(fileName, "uevent"); |
| 51 | parser = config_open2(uevent_filename, fopen_for_read); | 51 | parser = config_open2(uevent_filename, fopen_for_read); |
| 52 | free(uevent_filename); | 52 | free(uevent_filename); |
| 53 | 53 | ||
diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c index 0a9e505f4..f7d0de32d 100644 --- a/util-linux/lsusb.c +++ b/util-linux/lsusb.c | |||
| @@ -50,7 +50,7 @@ static int FAST_FUNC fileAction(struct recursive_state *state UNUSED_PARAM, | |||
| 50 | char *tokens[4]; | 50 | char *tokens[4]; |
| 51 | char *busnum = NULL, *devnum = NULL; | 51 | char *busnum = NULL, *devnum = NULL; |
| 52 | int product_vid = 0, product_did = 0; | 52 | int product_vid = 0, product_did = 0; |
| 53 | char *uevent_filename = concat_path_file(fileName, "/uevent"); | 53 | char *uevent_filename = concat_path_file(fileName, "uevent"); |
| 54 | 54 | ||
| 55 | parser = config_open2(uevent_filename, fopen_for_read); | 55 | parser = config_open2(uevent_filename, fopen_for_read); |
| 56 | free(uevent_filename); | 56 | free(uevent_filename); |