From 28ab85c41823a2ef5e08c69a0dd721adfa5b4047 Mon Sep 17 00:00:00 2001 From: Ludovic Rousseau Date: Sat, 14 Apr 2012 09:27:24 +0200 Subject: [PATCH] Samples: Fix initialization discards qualifiers warnings in xusb.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit xusb.c: In function ‘read_ms_winsub_feature_descriptors’: xusb.c:542: warning: initialization discards qualifiers from pointer target type xusb.c:543: warning: initialization discards qualifiers from pointer target type xusb.c: In function ‘test_device’: xusb.c:598: warning: initialization discards qualifiers from pointer target type xusb.c:598: warning: initialization discards qualifiers from pointer target type xusb.c:598: warning: initialization discards qualifiers from pointer target type xusb.c:599: warning: initialization discards qualifiers from pointer target type xusb.c:599: warning: initialization discards qualifiers from pointer target type --- examples/xusb.c | 4 ++-- libusb/version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/xusb.c b/examples/xusb.c index 8fd4807..fe2785f 100644 --- a/examples/xusb.c +++ b/examples/xusb.c @@ -534,7 +534,7 @@ static void read_ms_winsub_feature_descriptors(libusb_device_handle *handle, uin uint32_t length; void* le_type_punning_IS_fine; struct { - char* desc; + const char* desc; uint8_t recipient; uint16_t index; uint16_t header_size; @@ -595,7 +595,7 @@ static int test_device(uint16_t vid, uint16_t pid) int iface_detached = -1; #endif struct libusb_device_descriptor dev_desc; - char* speed_name[5] = { "Unknown", "1.5 Mbit/s (USB 1.0 LowSpeed)", "12 Mbit/s (USB 1.0 FullSpeed)", + const char* speed_name[5] = { "Unknown", "1.5 Mbit/s (USB 1.0 LowSpeed)", "12 Mbit/s (USB 1.0 FullSpeed)", "480 Mbit/s (USB 2.0 HighSpeed)", "5000 Mbit/s (USB 3.0 SuperSpeed)"}; char string[128]; uint8_t string_index[3]; // indexes of the string descriptors diff --git a/libusb/version.h b/libusb/version.h index f17a4c4..3061e20 100644 --- a/libusb/version.h +++ b/libusb/version.h @@ -9,7 +9,7 @@ #define LIBUSB_MICRO 10 #endif #ifndef LIBUSB_NANO -#define LIBUSB_NANO 10474 +#define LIBUSB_NANO 10475 #endif /* LIBUSB_RC is the release candidate suffix. Should normally be empty. */ #ifndef LIBUSB_RC -- 2.7.4