chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extras: fix mis-spelling of "environment"
[elogind.git]
/
extras
/
usb_id
/
usb_id.c
diff --git
a/extras/usb_id/usb_id.c
b/extras/usb_id/usb_id.c
index 9ee4e6ece34a248025f29e67e3225147d4bb7891..0565e6403f2fd358844a33d2ebd228a10660c9c1 100644
(file)
--- a/
extras/usb_id/usb_id.c
+++ b/
extras/usb_id/usb_id.c
@@
-62,7
+62,7
@@
static void set_usb_iftype(char *to, int if_class_num, size_t len)
case 5: /* Physical */
break;
case 6:
case 5: /* Physical */
break;
case 6:
- type = "
image
";
+ type = "
media
";
break;
case 7:
type = "printer";
break;
case 7:
type = "printer";
@@
-192,7
+192,7
@@
static int usb_id(struct udev_device *dev)
dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
/* usb interface directory */
dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
/* usb interface directory */
- dev_interface = udev_device_get_parent_with_subsystem_devtype(dev, "usb",
NULL
);
+ dev_interface = udev_device_get_parent_with_subsystem_devtype(dev, "usb",
"usb_interface"
);
if (dev_interface == NULL) {
info(udev, "unable to access usb_interface device of '%s'\n",
udev_device_get_syspath(dev));
if (dev_interface == NULL) {
info(udev, "unable to access usb_interface device of '%s'\n",
udev_device_get_syspath(dev));
@@
-218,7
+218,7
@@
static int usb_id(struct udev_device *dev)
udev_device_get_syspath(dev_interface), if_class_num, protocol);
/* usb device directory */
udev_device_get_syspath(dev_interface), if_class_num, protocol);
/* usb device directory */
- dev_usb = udev_device_get_parent_with_subsystem_devtype(dev_interface, "usb",
NULL
);
+ dev_usb = udev_device_get_parent_with_subsystem_devtype(dev_interface, "usb",
"usb_device"
);
if (!dev_usb) {
info(udev, "unable to find parent 'usb' device of '%s'\n",
udev_device_get_syspath(dev));
if (!dev_usb) {
info(udev, "unable to find parent 'usb' device of '%s'\n",
udev_device_get_syspath(dev));
@@
-232,7
+232,7
@@
static int usb_id(struct udev_device *dev)
int host, bus, target, lun;
/* get scsi device */
int host, bus, target, lun;
/* get scsi device */
- dev_scsi = udev_device_get_parent_with_subsystem_devtype(dev, "scsi",
NULL
);
+ dev_scsi = udev_device_get_parent_with_subsystem_devtype(dev, "scsi",
"scsi_device"
);
if (dev_scsi == NULL) {
info(udev, "unable to find parent 'scsi' device of '%s'\n",
udev_device_get_syspath(dev));
if (dev_scsi == NULL) {
info(udev, "unable to find parent 'scsi' device of '%s'\n",
udev_device_get_syspath(dev));
@@
-395,7
+395,7
@@
int main(int argc, char **argv)
printf("Usage: usb_id [--usb-info] [--num-info] [--export] [--help] <devpath>\n"
" --usb-info use usb strings instead\n"
" --num-info use numerical values\n"
printf("Usage: usb_id [--usb-info] [--num-info] [--export] [--help] <devpath>\n"
" --usb-info use usb strings instead\n"
" --num-info use numerical values\n"
- " --export print values as environ
em
t keys\n"
+ " --export print values as environ
men
t keys\n"
" --help print this help text\n\n");
default:
retval = 1;
" --help print this help text\n\n");
default:
retval = 1;