diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2012-01-12 14:31:02 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-12 14:31:02 -0800 |
commit | 623f0f24c7d62c749ff18649e18a32f8d57c421c (patch) | |
tree | 544965a0ba9ed27a4b82d238df3027f6a530b423 | |
parent | bdfc97cd645f3a5c8db855250c36de54b7b22999 (diff) | |
download | usbutils-623f0f24c7d62c749ff18649e18a32f8d57c421c.tar.gz |
simplify get_string()
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | lsusb.c | 18 |
1 files changed, 4 insertions, 14 deletions
@@ -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) |