ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

just some compiler warning cleanup. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2562 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-03-05 22:35:06 +00:00
parent 3f840806b3
commit 02a4b49df1
9 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/Src/ChunkFile.h
View File

@ -157,8 +157,8 @@ public:
return false; return false;
} }
FILE* pFile; FILE* pFile = fopen(_rFilename.c_str(), "rb");
if (! (pFile = fopen(_rFilename.c_str(), "rb"))) { if (!pFile) {
ERROR_LOG(COMMON,"ChunkReader: Can't open file for reading"); ERROR_LOG(COMMON,"ChunkReader: Can't open file for reading");
return false; return false;
} }
@ -219,8 +219,8 @@ public:
FILE* pFile; FILE* pFile;
INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str()); INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str());
pFile = fopen(_rFilename.c_str(), "wb");
if (! (pFile = fopen(_rFilename.c_str(), "wb"))) { if (!pFile) {
ERROR_LOG(COMMON,"ChunkReader: Error opening file for write"); ERROR_LOG(COMMON,"ChunkReader: Error opening file for write");
return false; return false;
} }

8
Source/Core/Common/Src/Log.h
View File

@ -83,10 +83,10 @@ enum LOG_LEVELS {
#endif // loglevel #endif // loglevel
#endif // logging #endif // logging
#define ERROR_LOG(...) #define ERROR_LOG(...) {}
#define WARN_LOG(...) #define WARN_LOG(...) {}
#define INFO_LOG(...) #define INFO_LOG(...) {}
#define DEBUG_LOG(...) #define DEBUG_LOG(...) {}
extern void __Log(int logNumber, const char* text, ...); extern void __Log(int logNumber, const char* text, ...);

3
Source/Core/Core/Src/HW/SystemTimers.cpp
View File

@ -76,8 +76,9 @@
#include "../IPC_HLE/WII_IPC_HLE.h" #include "../IPC_HLE/WII_IPC_HLE.h"
#include "Thread.h" #include "Thread.h"
#include "Timer.h" #include "Timer.h"
///////////////////////////// #include "../SmartFrameLimiter.h"
/////////////////////////////
namespace SystemTimers namespace SystemTimers
{ {

2
Source/Core/DebuggerWX/Src/CodeWindowSJP.cpp
View File

@ -206,7 +206,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
bool started = false; bool started = false;
while (!feof(f)) while (!feof(f))
{ {
char line[512], temp[256]; char line[512];
fgets(line, 511, f); fgets(line, 511, f);
if (strlen(line) < 4) if (strlen(line) < 4)
continue; continue;

1
Source/Core/DiscIO/Src/NANDContentLoader.cpp
View File

@ -144,7 +144,6 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath)
} else { } else {
ERROR_LOG(DISCIO, "CreateFromDirectory: error opening %s", ERROR_LOG(DISCIO, "CreateFromDirectory: error opening %s",
szFilename); szFilename);
} }
} }

9
Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
View File

@ -1158,7 +1158,7 @@ bool GCMemcard::format(bool New)
bool GCMemcard::formatWIP(int slot, bool New, bool sjis) bool GCMemcard::formatWIP(int slot, bool New, bool sjis)
{ {
u32 data_size = 0x2000 * (0x80 * 0x10 - 5); u32 data_size = 0x2000 * (0x80 * 0x10 - 5);
u16 size = u16((((data_size / 0x2000) + 5) / 0x10)); u16 size = (u16)(((data_size / 0x2000) + 5) / 0x10);
SRAM m_SRAM; SRAM m_SRAM;
FILE * pStream; FILE * pStream;
u64 time, rand; u64 time, rand;
@ -1183,15 +1183,14 @@ bool GCMemcard::formatWIP(int slot, bool New, bool sjis)
for(int i = 0; i < 12; i++) for(int i = 0; i < 12; i++)
{ {
rand = (((rand*(u64)0x0000000041c64e6dULL)+(u64)0x0000000000003039ULL)>>16);
rand = (((rand*(u64)0x0000000041c64e6d)+(u64)0x0000000000003039)>>16);
// PanicAlert("%16x",rand); // PanicAlert("%16x",rand);
// PanicAlert("m_SRAM.syssramex.flash_id %16x",(flash_id[i])); // PanicAlert("m_SRAM.syssramex.flash_id %16x",(flash_id[i]));
// PanicAlert("%16x",(flash_id[i]+(u32)rand)); // PanicAlert("%16x",(flash_id[i]+(u32)rand));
// PanicAlert("%16x",(flash_id+Common::swap32((u32)rand))); // PanicAlert("%16x",(flash_id+Common::swap32((u32)rand)));
hdr.serial[i] = u8((flash_id[i]+(u32)rand)); hdr.serial[i] = u8((flash_id[i]+(u32)rand));
rand = (((rand*(u64)0x0000000041c64e6d)+(u64)0x0000000000003039)>>16); rand = (((rand*(u64)0x0000000041c64e6dULL)+(u64)0x0000000000003039ULL)>>16);
rand &= (u64)0x0000000000007fff; rand &= (u64)0x0000000000007fffULL;
} }
hdr.fmtTime.high = (time >> 32) & 0xFFFFFFFF; hdr.fmtTime.high = (time >> 32) & 0xFFFFFFFF;
hdr.fmtTime.low = time & 0xFFFFFFFF; hdr.fmtTime.low = time & 0xFFFFFFFF;

4
Source/Core/InputCommon/Src/EventHandler.cpp
View File

@ -8,8 +8,8 @@ EventHandler *EventHandler::m_Instance = 0;
EventHandler::EventHandler() { EventHandler::EventHandler() {
for (int i=0; i<NUMKEYS; i++) for (int i=0; i<NUMKEYS; i++)
for (int j=0; j<NUMMODS; j++) for (int j=0; j<NUMMODS; j++)
keys[i][j] = NULL; keys[i][j] = NULL;
// memset(keys, sizeof(listenFuncPtr) * NUMKEYS*NUMMODS, 0); // memset(keys, sizeof(listenFuncPtr) * NUMKEYS*NUMMODS, 0);
memset(mouse, sizeof(listenFuncPtr) * (sf::Mouse::Count+1), 0); memset(mouse, sizeof(listenFuncPtr) * (sf::Mouse::Count+1), 0);
memset(joys, sizeof(listenFuncPtr) * (sf::Joy::Count+1), 0); memset(joys, sizeof(listenFuncPtr) * (sf::Joy::Count+1), 0);

8
Source/Core/VideoCommon/Src/VideoCommon.h
View File

@ -97,7 +97,13 @@ inline float Memory_Read_Float(u32 _uAddress)
struct TRectangle struct TRectangle
{ {
int left, top, right, bottom; int left;
int top;
int right;
int bottom;
int GetWidth() const { return right - left; }
int GetHeight() const { return bottom - top; }
}; };
// Logging // Logging

2
Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
View File

@ -85,7 +85,7 @@ void PixelShaderCache::SetShader()
bool HLSL = false; bool HLSL = false;
const char *code = GeneratePixelShader(PixelShaderManager::GetTextureMask(), false, false, HLSL); const char *code = GeneratePixelShader(PixelShaderManager::GetTextureMask(), false, false, HLSL);
LPDIRECT3DPIXELSHADER9 shader = HLSL ? D3D::CompilePixelShader(code, strlen(code), false) : CompileCgShader(code); LPDIRECT3DPIXELSHADER9 shader = HLSL ? D3D::CompilePixelShader(code, (int)strlen(code), false) : CompileCgShader(code);
if (shader) if (shader)
{ {
//Make an entry in the table //Make an entry in the table