summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2012-01-12 14:31:02 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-12 14:31:02 -0800
commit623f0f24c7d62c749ff18649e18a32f8d57c421c (patch)
tree544965a0ba9ed27a4b82d238df3027f6a530b423
parentbdfc97cd645f3a5c8db855250c36de54b7b22999 (diff)
downloadusbutils-623f0f24c7d62c749ff18649e18a32f8d57c421c.tar.gz
simplify get_string()
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--lsusb.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/lsusb.c b/lsusb.c
index 987ef26..03ca978 100644
--- a/lsusb.c
+++ b/lsusb.c
@@ -185,23 +185,13 @@ static int get_string(libusb_device_handle *dev, char *buf, size_t size, u_int8_
{
int ret;
- if (!dev) {
- buf[0] = 0;
- return 0;
- }
-
- if (id) {
+ if (dev && id) {
ret = libusb_get_string_descriptor_ascii(dev, id, (void *)buf, size);
- if (ret <= 0) {
- buf[0] = 0;
- return 0;
- } else
+ if (ret > 0)
return ret;
-
- } else {
- buf[0] = 0;
- return 0;
}
+ buf[0] = 0;
+ return 0;
}
static int get_class_string(char *buf, size_t size, u_int8_t cls)