listusb: also display vendor and device strings in non verbose mode.

2012-03-15 21:34:28 +01:00
parent 46ebe27f98
commit 5d043aeb0f
1 changed files with 9 additions and 8 deletions
@@ -145,18 +145,19 @@ DumpConfiguration(const BUSBConfiguration *configuration)
 static void
 DumpInfo(BUSBDevice &device, bool verbose)
 {
-	if (!verbose) {
-		printf("%04x:%04x /dev/bus/usb%s \"%s\" \"%s\" ver. %04x\n",
-			device.VendorID(), device.ProductID(), device.Location(),
-			device.ManufacturerString(), device.ProductString(),
-			device.Version());
-		return;
-	}
-
 	const char *vendorName = NULL, *deviceName = NULL;
 	usb_get_vendor_info(device.VendorID(), &vendorName);
 	usb_get_device_info(device.VendorID(), device.ProductID(), &deviceName);

+	if (!verbose) {
+		printf("%04x:%04x /dev/bus/usb%s \"%s\" \"%s\" ver. %04x\n",
+			device.VendorID(), device.ProductID(), device.Location(),
+			vendorName ? vendorName : device.ManufacturerString(),
+			deviceName ? deviceName : device.ProductString(),
+			device.Version());
+		return;
+	}
+
 	printf("[Device /dev/bus/usb%s]\n", device.Location());
 	printf("    Class .................. 0x%02x (%s)\n", device.Class(),
 		ClassName(device.Class()));