diff options
| author | pfg <pfg@FreeBSD.org> | 2015-08-05 18:52:40 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2015-08-05 18:52:40 +0000 |
| commit | 49f78cbad85113f3c8517025048edc0250d67715 (patch) | |
| tree | 4eaa283095236d9b13eb95e293b8e5e98ccc908d /lib | |
| parent | 17d50360d14e48593249c1ba8f818b9227c9480d (diff) | |
| download | FreeBSD-src-49f78cbad85113f3c8517025048edc0250d67715.zip FreeBSD-src-49f78cbad85113f3c8517025048edc0250d67715.tar.gz | |
MFC r285720:
libusb: Fix minor warning.
Fix a warning triggered by the gcc + FORTIFY_SOURCE patches:
In function 'libusb20_parse_config_desc': lib/libusb/libusb20_desc.c:141:
warning: passing argument 1 of 'memcpy' discards qualifiers from pointer
target type
Submitted by: hselansky
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libusb/libusb20_desc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libusb/libusb20_desc.c b/lib/libusb/libusb20_desc.c index 22077b6..419993b 100644 --- a/lib/libusb/libusb20_desc.c +++ b/lib/libusb/libusb20_desc.c @@ -137,15 +137,13 @@ libusb20_parse_config_desc(const void *config_desc) * Make a copy of the config descriptor, so that the caller can free * the inital config descriptor pointer! */ - ptr = (void *)(lub_endpoint + nendpoint); - memcpy(LIBUSB20_ADD_BYTES(ptr, 0), config_desc, pcdesc.len); + memcpy((void *)(lub_endpoint + nendpoint), config_desc, pcdesc.len); + + ptr = (const void *)(lub_endpoint + nendpoint); pcdesc.ptr = LIBUSB20_ADD_BYTES(ptr, 0); - config_desc = LIBUSB20_ADD_BYTES(ptr, 0); /* init config structure */ - ptr = config_desc; - LIBUSB20_INIT(LIBUSB20_CONFIG_DESC, &lub_config->desc); if (libusb20_me_decode(ptr, ptr[0], &lub_config->desc)) { |
