From b08b1993a8b3850b818a861d6317ba0df8b090ab Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Wed, 22 Feb 2017 13:27:11 -0800 Subject: [PATCH] core: Silence 'unhandled case in switch' warning. linux_usbfs: silence -Wsign-compare. Closes #274 Signed-off-by: Chris Dickens --- libusb/core.c | 2 ++ libusb/os/linux_usbfs.c | 4 ++-- libusb/version_nano.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libusb/core.c b/libusb/core.c index 0f3f37e..2dac909 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -2334,6 +2334,7 @@ static void usbi_log_str(struct libusb_context *ctx, case LIBUSB_LOG_LEVEL_WARNING: priority = ANDROID_LOG_WARN; break; case LIBUSB_LOG_LEVEL_ERROR: priority = ANDROID_LOG_ERROR; break; case LIBUSB_LOG_LEVEL_DEBUG: priority = ANDROID_LOG_DEBUG; break; + case LIBUSB_LOG_LEVEL_NONE: return; } __android_log_write(priority, "libusb", str); #elif defined(HAVE_SYSLOG_FUNC) @@ -2343,6 +2344,7 @@ static void usbi_log_str(struct libusb_context *ctx, case LIBUSB_LOG_LEVEL_WARNING: syslog_level = LOG_WARNING; break; case LIBUSB_LOG_LEVEL_ERROR: syslog_level = LOG_ERR; break; case LIBUSB_LOG_LEVEL_DEBUG: syslog_level = LOG_DEBUG; break; + case LIBUSB_LOG_LEVEL_NONE: return; } syslog(syslog_level, "%s", str); #else /* All of gcc, Clang, XCode seem to use #warning */ diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c index ba437bd..442ee6a 100644 --- a/libusb/os/linux_usbfs.c +++ b/libusb/os/linux_usbfs.c @@ -806,7 +806,7 @@ static int op_get_active_config_descriptor(struct libusb_device *dev, if (r < 0) return r; - len = MIN(len, r); + len = MIN(len, (size_t)r); memcpy(buffer, config_desc, len); return len; } @@ -836,7 +836,7 @@ static int op_get_config_descriptor(struct libusb_device *dev, descriptors += r; } - len = MIN(len, r); + len = MIN(len, (size_t)r); memcpy(buffer, descriptors, len); return len; } diff --git a/libusb/version_nano.h b/libusb/version_nano.h index fd1ecda..900c220 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11189 +#define LIBUSB_NANO 11190 -- 2.7.4