From e1cacc0762630b1aabef29e8e8a3f394030f8877 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 3 Jul 2020 14:48:07 +0200 Subject: [PATCH] Improved error log for string descriptor read issues (cherry picked from commit dd2589cebcac5b39c6af9bbe9f444f6451e9ad4b) --- channels/urbdrc/client/libusb/libusb_udevice.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index 7072d9d..d435376 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -798,10 +798,13 @@ static UINT32 libusb_udev_control_query_device_text(IUDEVICE* idev, UINT32 TextT if ((ret <= 0) || (ret <= 4) || (slen <= 4) || (locale != LIBUSB_DT_STRING) || (ret > UINT8_MAX)) { + char* msg = "SHORT_DESCRIPTOR"; + if (ret < 0) + msg = libusb_error_name(ret); WLog_Print(urbdrc->log, WLOG_DEBUG, "libusb_get_string_descriptor: " - "ERROR num %d, iProduct: %" PRIu8 "!", - ret, devDescriptor->iProduct); + "%s [%d], iProduct: %" PRIu8 "!", + msg, ret, devDescriptor->iProduct); len = strnlen(strDesc, MIN(sizeof(strDesc), inSize)); for (i = 0; i < len; i++) -- 2.7.4