ChangeSet 1.2181.4.1, 2005/03/14 22:57:23-08:00, [EMAIL PROTECTED]
[PATCH] USB: optimize the usb-storage device string logic a bit.
As pointed out by Alan Stern <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
scsiglue.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff -Nru a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
--- a/drivers/usb/storage/scsiglue.c 2005-03-30 15:04:14 -08:00
+++ b/drivers/usb/storage/scsiglue.c 2005-03-30 15:04:14 -08:00
@@ -345,6 +345,7 @@
{
struct us_data *us;
char *pos = buffer;
+ const char *string;
/* if someone is sending us data, just throw it away */
if (inout)
@@ -357,21 +358,24 @@
/* print product, vendor, and serial number strings */
if (us->pusb_dev->manufacturer)
- SPRINTF(" Vendor: %s\n", us->pusb_dev->manufacturer);
+ string = us->pusb_dev->manufacturer;
else if (us->unusual_dev->vendorName)
- SPRINTF(" Vendor: %s\n", us->unusual_dev->vendorName);
+ string = us->unusual_dev->vendorName;
else
- SPRINTF(" Vendor: Unknown\n");
+ string = "Unknown";
+ SPRINTF(" Vendor: %s\n", string);
if (us->pusb_dev->product)
- SPRINTF(" Product: %s\n", us->pusb_dev->product);
+ string = us->pusb_dev->product;
else if (us->unusual_dev->productName)
- SPRINTF(" Product: %s\n", us->unusual_dev->productName);
+ string = us->unusual_dev->productName;
else
- SPRINTF(" Product: Unknown\n");
+ string = "Unknown";
+ SPRINTF(" Product: %s\n", string);
if (us->pusb_dev->serial)
- SPRINTF("Serial Number: %s\n", us->pusb_dev->serial);
+ string = us->pusb_dev->serial;
else
- SPRINTF("Serial Number: None\n");
+ string = "None";
+ SPRINTF("Serial Number: %s\n", string);
/* show the protocol and transport */
SPRINTF(" Protocol: %s\n", us->protocol_name);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
