Date: Wed, 5 Aug 2015 18:52:41 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r286333 - stable/10/lib/libusb Message-ID: <201508051852.t75Iqfuv072947@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Wed Aug 5 18:52:40 2015 New Revision: 286333 URL: https://svnweb.freebsd.org/changeset/base/286333 Log: 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 Modified: stable/10/lib/libusb/libusb20_desc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libusb/libusb20_desc.c ============================================================================== --- stable/10/lib/libusb/libusb20_desc.c Wed Aug 5 18:30:00 2015 (r286332) +++ stable/10/lib/libusb/libusb20_desc.c Wed Aug 5 18:52:40 2015 (r286333) @@ -137,15 +137,13 @@ libusb20_parse_config_desc(const void *c * 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)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508051852.t75Iqfuv072947>