summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-10-22 10:46:52 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-22 10:46:52 +0200
commitc0e69258f52328bf40d3be36a3894a5d89be527c (patch)
treea07f22ae31971097f37812465abffe0b3f6923b6
parente7190fef4cab0b658f97d4b95de52bd6fb5eb660 (diff)
downloadusbutils-c0e69258f52328bf40d3be36a3894a5d89be527c.tar.gz
lsusb-t.c: fix up some complier warnings
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--lsusb-t.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/lsusb-t.c b/lsusb-t.c
index 5438704..5ddaced 100644
--- a/lsusb-t.c
+++ b/lsusb-t.c
@@ -301,7 +301,7 @@ static void add_usb_interface(const char *d_name)
{
struct usbinterface *e;
const char *p;
- char *pn, link[MY_PATH_MAX];
+ char *pn, driver[MY_PATH_MAX];
unsigned long i;
int l;
p = strchr(d_name, ':');
@@ -327,17 +327,17 @@ static void add_usb_interface(const char *d_name)
SYSFS_INTx(d_name, e, bInterfaceProtocol);
SYSFS_INTx(d_name, e, bInterfaceSubClass);
SYSFS_INTx(d_name, e, bNumEndpoints);
- l = snprintf(link, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
+ l = snprintf(driver, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
if (l > 0 && l < MY_PATH_MAX) {
- l = readlink(link, link, MY_PATH_MAX);
+ l = readlink(driver, driver, MY_PATH_MAX);
if (l < 0)
perror(d_name);
else {
if (l < MY_PATH_MAX - 1)
- link[l] = '\0';
+ driver[l] = '\0';
else
- link[0] = '\0';
- p = strrchr(link, '/');
+ driver[0] = '\0';
+ p = strrchr(driver, '/');
if (p)
snprintf(e->driver, sizeof(e->driver), "%s", p + 1);
}
@@ -350,7 +350,7 @@ static void add_usb_device(const char *d_name)
{
struct usbdevice *d;
const char *p;
- char *pn, link[MY_PATH_MAX];
+ char *pn, driver[MY_PATH_MAX];
unsigned long i;
int l;
p = d_name;
@@ -392,17 +392,17 @@ static void add_usb_device(const char *d_name)
SYSFS_STR(d_name, d, serial);
SYSFS_STR(d_name, d, version);
SYSFS_STR(d_name, d, speed);
- l = snprintf(link, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
+ l = snprintf(driver, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
if (l > 0 && l < MY_PATH_MAX) {
- l = readlink(link, link, MY_PATH_MAX);
+ l = readlink(driver, driver, MY_PATH_MAX);
if (l < 0)
perror(d_name);
else {
if (l < MY_PATH_MAX - 1)
- link[l] = '\0';
+ driver[l] = '\0';
else
- link[0] = '\0';
- p = strrchr(link, '/');
+ driver[0] = '\0';
+ p = strrchr(driver, '/');
if (p)
snprintf(d->driver, sizeof(d->driver), "%s", p + 1);
}