Skip to content

Commit a4b30fb

Browse files
committed
fixes new gcc 10.1 compiler warnings
1 parent 6a5f11d commit a4b30fb

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

code/veccart/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ docker-build: Dockerfile
9797
docker:
9898
docker run --rm -t -v `pwd`:/build/veccart -u `id -u ${USER}`:`id -g ${USER}` stm32-build make images $(HW_VER_ARGS)
9999

100+
# '$ make bash' puts you in the docker container interactive shell for debugging
100101
bash:
101102
docker run --rm -it -v `pwd`:/build/veccart -u `id -u ${USER}`:`id -g ${USER}` stm32-build bash
102103

code/veccart/fatfs/ff.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,10 @@ void gen_numname (
13661366
ns[i--] = c;
13671367
seq /= 16;
13681368
} while (seq);
1369+
#pragma GCC diagnostic push
1370+
#pragma GCC diagnostic ignored "-Wstringop-overflow="
13691371
ns[i] = '~';
1372+
#pragma GCC diagnostic pop
13701373

13711374
/* Append the number */
13721375
for (j = 0; j < i && dst[j] != ' '; j++) {

code/veccart/menu.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ void loadListing(char *fdir, dir_listing *listing, const int fnptrs, const int s
2727
for (idx = 0; idx < listing->num_files; idx++) {
2828
f_entry=&(listing->f_entry[idx]);
2929

30-
strncpy(buff, f_entry->fname, sizeof(buff));
30+
strncpy(buff, f_entry->fname, sizeof(buff)-1);
31+
buff[sizeof(buff)-1] = '\0';
3132
name=buff;
3233

3334
is_dir=f_entry->is_dir;

code/veccart/usb_msc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -854,9 +854,9 @@ static void msc_data_tx_cb(usbd_device *usbd_dev, uint8_t ep)
854854
/** @brief Handle various control requests related to the msc storage
855855
* interface.
856856
*/
857-
static int msc_control_request(usbd_device *usbd_dev,
858-
struct usb_setup_data *req, uint8_t **buf, uint16_t *len,
859-
void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
857+
static enum usbd_request_return_codes msc_control_request(usbd_device *usbd_dev,
858+
struct usb_setup_data *req, uint8_t **buf, uint16_t *len,
859+
void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
860860
{
861861
(void)complete;
862862
(void)usbd_dev;
@@ -893,7 +893,7 @@ static void msc_set_config(usbd_device *usbd_dev, uint16_t wValue)
893893
usbd_dev,
894894
USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
895895
USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,
896-
(usbd_control_callback) msc_control_request);
896+
msc_control_request);
897897
}
898898

899899
/** @addtogroup usb_msc */

0 commit comments

Comments
 (0)