From bc3b156cf5a821d775be4decd79c9c6f25e9515f Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Fri, 19 Mar 2021 20:59:03 -0400 Subject: [PATCH] Compiler warning cleanup of unused variables and exception handling. --- src/boards/178.cpp | 4 ++-- src/boards/28.cpp | 4 ++-- src/boards/bonza.cpp | 12 ++++++------ src/boards/unrom512.cpp | 6 +++--- src/drawing.cpp | 8 ++++---- src/drivers/common/config.cpp | 2 +- src/drivers/common/configSys.cpp | 4 ++-- src/oldmovie.cpp | 12 ++++++------ src/utils/xstring.cpp | 2 +- src/video.cpp | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/boards/178.cpp b/src/boards/178.cpp index 65e98a12..d5773293 100644 --- a/src/boards/178.cpp +++ b/src/boards/178.cpp @@ -37,8 +37,8 @@ static int32 SensorDelay; // highly experimental, not actually working, just curious if it hapen to work with some other decoder // SND Registers static uint8 pcm_enable = 0; -static int16 pcm_latch = 0x3F6, pcm_clock = 0x3F6; -static writefunc pcmwrite; +//static int16 pcm_latch = 0x3F6, pcm_clock = 0x3F6; +//static writefunc pcmwrite; static SFORMAT StateRegs[] = { diff --git a/src/boards/28.cpp b/src/boards/28.cpp index 617b3aec..46131398 100644 --- a/src/boards/28.cpp +++ b/src/boards/28.cpp @@ -127,14 +127,14 @@ static void Sync() static DECLFW(WriteEXP) { - uint32 addr = A; + //uint32 addr = A; uint8 value = V; reg = value & 0x81; } static DECLFW(WritePRG) { - uint32 addr = A; + //uint32 addr = A; uint8 value = V; switch (reg) { diff --git a/src/boards/bonza.cpp b/src/boards/bonza.cpp index 58f04f2e..ac8a2cf3 100644 --- a/src/boards/bonza.cpp +++ b/src/boards/bonza.cpp @@ -84,12 +84,12 @@ byte_8C29: .BYTE 0,$76, 0, 0, 8 byte_8CC6: .BYTE 0,$78, 0, 0,$12 */ -static uint8 sim0reset[0x1F] = { - 0x3B, 0xE9, 0x00, 0xFF, 0xC1, 0x10, 0x31, 0xFE, - 0x55, 0xC8, 0x10, 0x20, 0x55, 0x47, 0x4F, 0x53, - 0x56, 0x53, 0x43, 0xAD, 0x10, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 -}; +//static uint8 sim0reset[0x1F] = { +// 0x3B, 0xE9, 0x00, 0xFF, 0xC1, 0x10, 0x31, 0xFE, +// 0x55, 0xC8, 0x10, 0x20, 0x55, 0x47, 0x4F, 0x53, +// 0x56, 0x53, 0x43, 0xAD, 0x10, 0x10, 0x10, 0x10, +// 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 +//}; static void Sync(void) { setprg32(0x8000, prg_reg); diff --git a/src/boards/unrom512.cpp b/src/boards/unrom512.cpp index 845b9689..973749ea 100644 --- a/src/boards/unrom512.cpp +++ b/src/boards/unrom512.cpp @@ -40,8 +40,8 @@ static uint16 latcha; static uint8 *flashdata; static uint32 *flash_write_count; static uint8 *FlashPage[32]; -static uint32 *FlashWriteCountPage[32]; -static uint8 flashloaded = false; +//static uint32 *FlashWriteCountPage[32]; +//static uint8 flashloaded = false; static uint8 flash_save=0, flash_state=0, flash_mode=0, flash_bank; static void (*WLSync)(void); @@ -282,4 +282,4 @@ void UNROM512_Init(CartInfo *info) { } AddExState(&latche, 1, 0, "LATC"); AddExState(&bus_conflict, 1, 0, "BUSC"); -} \ No newline at end of file +} diff --git a/src/drawing.cpp b/src/drawing.cpp index 2d64fd82..7597c068 100644 --- a/src/drawing.cpp +++ b/src/drawing.cpp @@ -395,10 +395,10 @@ static int FixJoedChar(uint8 ch) int c = ch - 32; return (c < 0 || c > 98) ? 0 : c; } -static int JoedCharWidth(uint8 ch) -{ - return Font6x7[FixJoedChar(ch)*8]; -} +//static int JoedCharWidth(uint8 ch) +//{ +// return Font6x7[FixJoedChar(ch)*8]; +//} char target[64][256]; diff --git a/src/drivers/common/config.cpp b/src/drivers/common/config.cpp index ca610616..7f1157e1 100644 --- a/src/drivers/common/config.cpp +++ b/src/drivers/common/config.cpp @@ -125,7 +125,7 @@ static void cfg_Save(FILE *fp) { if(it->first.size()>30 || it->second.size()>30) { - int zzz=9; + //int zzz=9; } fprintf(fp,"%s %s\n",it->first.c_str(),it->second.c_str()); } diff --git a/src/drivers/common/configSys.cpp b/src/drivers/common/configSys.cpp index 6a9414b4..ac173d6c 100644 --- a/src/drivers/common/configSys.cpp +++ b/src/drivers/common/configSys.cpp @@ -687,7 +687,7 @@ Config::_loadFile(const char* fname) // close the file config.close(); - } catch(std::fstream::failure e) { + } catch(std::fstream::failure &e) { std::cerr << e.what() << std::endl; return -1; } @@ -743,7 +743,7 @@ Config::save() // close the file config.close(); - } catch(std::fstream::failure e) + } catch(std::fstream::failure &e) { std::cerr << e.what() << std::endl; return -1; diff --git a/src/oldmovie.cpp b/src/oldmovie.cpp index d024e09b..5c45e8ff 100644 --- a/src/oldmovie.cpp +++ b/src/oldmovie.cpp @@ -93,7 +93,7 @@ void convert_metadata(char* metadata, int metadata_size, uint8* tmp, int metadat } //backwards compat -static void FCEUI_LoadMovie_v1(char *fname, int _read_only); +//static void FCEUI_LoadMovie_v1(char *fname, int _read_only); //static int FCEUI_MovieGetInfo_v1(const char* fname, MOVIE_INFO* info); //int _old_FCEUI_MovieGetInfo(const char* fname, MOVIE_INFO* info) @@ -539,7 +539,7 @@ EFCM_CONVERTRESULT convert_fcm(MovieData& md, std::string fname) uint32 framecount; uint32 rerecord_count; - int movieConvertOffset1=0, movieConvertOffset2=0,movieSyncHackOn=0; + //int movieConvertOffset1=0, movieConvertOffset2=0,movieSyncHackOn=0; EMUFILE* fp = FCEUD_UTF8_fstream(fname, "rb"); @@ -599,10 +599,10 @@ EFCM_CONVERTRESULT convert_fcm(MovieData& md, std::string fname) //md.comments.push_back(L"author " + (std::wstring)(wchar_t*)wcmetadata); // FCEU_PrintError("flags[0] & MOVIE_FLAG_NOSYNCHACK=%d",flags[0] & MOVIE_FLAG_NOSYNCHACK); - if(flags[0] & MOVIE_FLAG_NOSYNCHACK) - movieSyncHackOn=0; - else - movieSyncHackOn=1; + //if(flags[0] & MOVIE_FLAG_NOSYNCHACK) + // movieSyncHackOn=0; + //else + // movieSyncHackOn=1; if(flags[0] & MOVIE_FLAG_PAL) md.palFlag = true; diff --git a/src/utils/xstring.cpp b/src/utils/xstring.cpp index 18984f1d..0c6df8cd 100644 --- a/src/utils/xstring.cpp +++ b/src/utils/xstring.cpp @@ -752,7 +752,7 @@ std::wstring mbstowcs(std::string str) // UTF8->UTF32 { try { return UtfConverter::FromUtf8(str); - } catch(std::exception) { + } catch(std::exception &e) { return L"(failed UTF-8 conversion)"; } } diff --git a/src/video.cpp b/src/video.cpp index 7167ea0f..0ff5d387 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -271,7 +271,6 @@ void FCEU_PutImage(void) //Fancy input display code if(input_display) { - extern uint32 JSAutoHeld; int i, j; uint8 *t = XBuf+(FSettings.LastSLine-9)*256 + 20; //mbg merge 7/17/06 changed t to uint8* if(input_display > 4) input_display = 4; @@ -290,6 +289,7 @@ void FCEU_PutImage(void) uint32 color; #ifdef __WIN_DRIVER__ + extern uint32 JSAutoHeld; // This doesn't work in anything except windows for now. // It doesn't get set anywhere in other ports. if (!oldInputDisplay)