funkey/picofe-irixxxx
1
0
Fork 0
mirror of https://github.com/FunKey-Project/picofe-irixxxx.git synced 2026-09-17 21:01:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

deal with some gcc7+ warnings

Browse Source
This commit is contained in:
notaz
2019-12-07 21:38:32 +02:00
parent f8cd6a082b
commit 795b71c571
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
linux/sndout_oss.c
View File

@@ -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;
}

20
menu.c
View File

@@ -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
}