summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McBride <sean@rogue-research.com>2017-12-29 13:30:24 -0500
committerChris Dickens <christopher.a.dickens@gmail.com>2018-01-08 10:33:47 -0800
commit678a43bcf3a493e613a7a5c40a9c9ffa57a1ce63 (patch)
tree640f75791324898f0b718d9c8fbe2a3fe9a620c0
parent297238cda8ffea04468eb1efaf574014f8fdade5 (diff)
downloadlibusb-678a43bcf3a493e613a7a5c40a9c9ffa57a1ce63.tar.gz
core: Fixed clang -Wcomma warning
Fixes: descriptor.c:1179:13: Possible misuse of comma operator here Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
-rw-r--r--libusb/descriptor.c3
-rw-r--r--libusb/version_nano.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index 509372c..74d6de5 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -1176,7 +1176,8 @@ int API_EXPORTED libusb_get_string_descriptor_ascii(libusb_device_handle *dev_ha
if (tbuf[0] > r)
return LIBUSB_ERROR_IO;
- for (di = 0, si = 2; si < tbuf[0]; si += 2) {
+ di = 0;
+ for (si = 2; si < tbuf[0]; si += 2) {
if (di >= (length - 1))
break;
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index ebdea71..ea7dafb 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11283
+#define LIBUSB_NANO 11284