From ab948f7e6d437dddd070000f36489d7e983eb4ad Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 7 Jun 2011 12:40:49 +0300 Subject: [PATCH] enable Wall warnings by default still disable it in some cases (instead of fixing) to avoid drifting from upstream projects too much. --- Makefile | 14 +++++++------- libpcsxcore/cdriso.c | 4 ++-- libpcsxcore/ppf.c | 3 +-- libpcsxcore/ppf.h | 2 ++ libpcsxcore/psxcommon.c | 7 ++++++- libpcsxcore/psxcounters.c | 2 +- libpcsxcore/sio.c | 2 +- libpcsxcore/socket.c | 2 +- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index d6e968fa..335a03ac 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ LD = $(CROSS_COMPILE)ld ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}') -CFLAGS += -ggdb -Ifrontend +CFLAGS += -Wall -ggdb -Ifrontend LDFLAGS += -lz -lpthread -ldl -lpng -lbz2 ifeq "$(ARCH)" "arm" CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math @@ -36,6 +36,9 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore ifeq "$(ARCH)" "arm" OBJS += libpcsxcore/gte_neon.o endif +libpcsxcore/cdrom.o libpcsxcore/misc.o: CFLAGS += -Wno-pointer-sign +libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull + # dynarec ifndef NO_NEW_DRC OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o @@ -44,6 +47,7 @@ endif OBJS += libpcsxcore/new_dynarec/emu_if.o libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \ libpcsxcore/new_dynarec/pcsxmem_inline.c +libpcsxcore/new_dynarec/new_dynarec.o: CFLAGS += -Wno-all -Wno-pointer-sign ifdef DRC_DBG libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -DDRC_DBG @@ -54,7 +58,6 @@ OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \ plugins/dfsound/registers.o plugins/dfsound/spu.o plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \ plugins/dfsound/xa.c -plugins/dfsound/%.o: CFLAGS += -Wall ifeq "$(USE_OSS)" "1" plugins/dfsound/%.o: CFLAGS += -DUSEOSS OBJS += plugins/dfsound/oss.o @@ -67,7 +70,7 @@ endif # gpu # note: code is not safe for strict-aliasing? (Castlevania problems) -plugins/dfxvideo/%.o: CFLAGS += -Wall -fno-strict-aliasing +plugins/dfxvideo/%.o: CFLAGS += -fno-strict-aliasing OBJS += plugins/dfxvideo/gpu.o plugins/dfxvideo/gpu.o: plugins/dfxvideo/fps.c plugins/dfxvideo/prim.c \ plugins/dfxvideo/gpu.c plugins/dfxvideo/soft.c @@ -79,11 +82,9 @@ OBJS += plugins/dfxvideo/draw_fb.o endif # cdrcimg -plugins/cdrcimg/%.o: CFLAGS += -Wall OBJS += plugins/cdrcimg/cdrcimg.o # dfinput -plugins/dfinput/%.o: CFLAGS += -Wall OBJS += plugins/dfinput/pad.o # gui @@ -91,7 +92,6 @@ OBJS += frontend/main.o frontend/plugin.o ifeq "$(USE_GTK)" "1" OBJS += maemo/hildon.o maemo/main.o maemo/%.o: maemo/%.c -maemo/%.o: CFLAGS += -Wall else OBJS += frontend/plugin_lib.o frontend/menu.o OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o @@ -114,7 +114,7 @@ endif ifdef PCNT CFLAGS += -DPCNT endif -frontend/%.o: CFLAGS += -Wall -DIN_EVDEV +frontend/%.o: CFLAGS += -DIN_EVDEV frontend/menu.o: frontend/revision.h frontend/revision.h: FORCE diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 2d371dd2..eb922812 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -833,7 +833,7 @@ static long CALLBACK ISOgetTD(unsigned char track, unsigned char *buffer) { unsigned int sect; unsigned char time[3]; sect = msf2sec(ti[numtracks].start) + msf2sec(ti[numtracks].length); - sec2msf(sect, time); + sec2msf(sect, (char *)time); buffer[2] = time[0]; buffer[1] = time[1]; buffer[0] = time[2]; @@ -913,7 +913,7 @@ static long CALLBACK ISOplay(unsigned char *time) { return 0; // find the track - sect = msf2sec(time); + sect = msf2sec((char *)time); for (i = numtracks; i > 1; i--) if (msf2sec(ti[i].start) <= sect + 2 * 75) break; diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c index 268ed1cb..ee32d8bb 100644 --- a/libpcsxcore/ppf.c +++ b/libpcsxcore/ppf.c @@ -335,7 +335,7 @@ void BuildPPFCache() { unsigned char *sbi_sectors; int LoadSBI(const char *fname, int sector_count) { - char buffer[16], sbifile[MAXPATHLEN]; + char buffer[16]; FILE *sbihandle; u8 sbitime[3]; int s; @@ -344,7 +344,6 @@ int LoadSBI(const char *fname, int sector_count) { if (sbihandle == NULL) return -1; -if (sbi_sectors != NULL) printf("sbi_sectors?\n"); sbi_sectors = calloc(1, sector_count / 8); if (sbi_sectors == NULL) return -1; diff --git a/libpcsxcore/ppf.h b/libpcsxcore/ppf.h index fdb11eba..aad85c93 100644 --- a/libpcsxcore/ppf.h +++ b/libpcsxcore/ppf.h @@ -32,6 +32,8 @@ void UnloadSBI(void); extern unsigned char *sbi_sectors; +#include "cdrom.h" + static inline int CheckSBI(const u8 *t) { int s; diff --git a/libpcsxcore/psxcommon.c b/libpcsxcore/psxcommon.c index ea655dfa..8313304c 100644 --- a/libpcsxcore/psxcommon.c +++ b/libpcsxcore/psxcommon.c @@ -57,7 +57,12 @@ void EmuUpdate() { SysUpdate(); ApplyCheats(); - pl_frame_limit(); + + // reamed hack + { + extern void pl_frame_limit(void); + pl_frame_limit(); + } } void __Log(char *fmt, ...) { diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index 1c514e8f..f6c1bc44 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -100,7 +100,7 @@ void verboseLog( s32 level, const char *str, ... ) vsprintf( buf, str, va ); va_end( va ); - printf( buf ); + printf( "%s", buf ); fflush( stdout ); } } diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c index 8a30797d..df130e81 100644 --- a/libpcsxcore/sio.c +++ b/libpcsxcore/sio.c @@ -673,7 +673,7 @@ void ConvertMcd(char *mcd, char *data) { } void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) { - unsigned char *data = NULL, *ptr, *str, *sstr; + char *data = NULL, *ptr, *str, *sstr; unsigned short clut[16]; unsigned short c; int i, x; diff --git a/libpcsxcore/socket.c b/libpcsxcore/socket.c index 2e0dc870..31f82e25 100644 --- a/libpcsxcore/socket.c +++ b/libpcsxcore/socket.c @@ -190,7 +190,7 @@ int ReadSocket(char * buffer, int len) { } int RawReadSocket(char * buffer, int len) { - int r; + int r = 0; int mlen = len < ptr ? len : ptr; if (!client_socket) -- 2.39.2