From 795b71c571518b310a22138141bb6d1cd08d85f6 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 7 Dec 2019 21:38:32 +0200 Subject: [PATCH] deal with some gcc7+ warnings --- linux/sndout_oss.c | 7 +++++-- menu.c | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/linux/sndout_oss.c b/linux/sndout_oss.c index e10d96a..6d4eded 100644 --- a/linux/sndout_oss.c +++ b/linux/sndout_oss.c @@ -192,7 +192,10 @@ void sndout_oss_setvol(int l, int r) void sndout_oss_exit(void) { - if (sounddev >= 0) close(sounddev); sounddev = -1; - if (mixerdev >= 0) close(mixerdev); mixerdev = -1; + if (sounddev >= 0) + close(sounddev); + if (mixerdev >= 0) + close(mixerdev); + sounddev = mixerdev = -1; } diff --git a/menu.c b/menu.c index 3f9cdec..f32c3ce 100644 --- a/menu.c +++ b/menu.c @@ -24,6 +24,10 @@ #include "plat.h" #include "posix.h" +#if defined(__GNUC__) && __GNUC__ >= 7 +#pragma GCC diagnostic ignored "-Wformat-truncation" +#endif + static char static_buff[64]; static int menu_error_time = 0; char menu_error_msg[64] = { 0, }; @@ -264,14 +268,14 @@ void menu_init_base(void) for (l = 0; l < 8; l++) { unsigned char fd8x8 = fontdata8x8[c*8+l]; - if (fd8x8&0x80) *fd = 0xf0; - if (fd8x8&0x40) *fd |= 0x0f; fd++; - if (fd8x8&0x20) *fd = 0xf0; - if (fd8x8&0x10) *fd |= 0x0f; fd++; - if (fd8x8&0x08) *fd = 0xf0; - if (fd8x8&0x04) *fd |= 0x0f; fd++; - if (fd8x8&0x02) *fd = 0xf0; - if (fd8x8&0x01) *fd |= 0x0f; fd++; + if (fd8x8&0x80) { *fd = 0xf0; } + if (fd8x8&0x40) { *fd |= 0x0f; }; fd++; + if (fd8x8&0x20) { *fd = 0xf0; } + if (fd8x8&0x10) { *fd |= 0x0f; }; fd++; + if (fd8x8&0x08) { *fd = 0xf0; } + if (fd8x8&0x04) { *fd |= 0x0f; }; fd++; + if (fd8x8&0x02) { *fd = 0xf0; } + if (fd8x8&0x01) { *fd |= 0x0f; }; fd++; } fd += 8*2/2; // 2 empty lines } -- 2.39.5