diff options
| author | LPFaint99 <lpfaint99@gmail.com> | 2009-03-07 08:07:11 +0000 |
|---|---|---|
| committer | LPFaint99 <lpfaint99@gmail.com> | 2009-03-07 08:07:11 +0000 |
| commit | f0431631a8a384ee0ff2c8bff2690ea56bde7d3b (patch) | |
| tree | bb7be69519e9fd164f2f717dadcd48775f8525ea /Source/Core/DiscIO | |
| parent | 251179b00b4cef9f8843da23ed9e96369271d77b (diff) | |
fix some gcc warnings
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2590 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Src/BannerLoaderGC.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/Blob.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/DriveBlob.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.h | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp index 9afcb3d119..5134bb3bb7 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp @@ -131,6 +131,8 @@ CBannerLoaderGC::GetName(std::string _rName[]) } break; + default: + break; } return returnCode; @@ -196,6 +198,8 @@ CBannerLoaderGC::GetDescription(std::string* _rDescription) returnCode = true; } break; + default: + break; } return returnCode; } diff --git a/Source/Core/DiscIO/Src/Blob.cpp b/Source/Core/DiscIO/Src/Blob.cpp index 7055f3df2a..13c8d983ff 100644 --- a/Source/Core/DiscIO/Src/Blob.cpp +++ b/Source/Core/DiscIO/Src/Blob.cpp @@ -71,7 +71,7 @@ bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr) while (remain > 0) { // Check if we are ready to do a large block read. > instead of >= so we don't bother if remain is only one block. - if (positionInBlock == 0 && remain > m_blocksize) + if (positionInBlock == 0 && remain > (u64)m_blocksize) { u64 num_blocks = remain / m_blocksize; ReadMultipleAlignedBlocks(block, num_blocks, out_ptr); @@ -110,7 +110,7 @@ bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr) bool SectorReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr) { - for (int i = 0; i < num_blocks; i++) + for (u64 i = 0; i < num_blocks; i++) { const u8 *data = GetBlockData(block_num + i); if (!data) diff --git a/Source/Core/DiscIO/Src/DriveBlob.cpp b/Source/Core/DiscIO/Src/DriveBlob.cpp index c4dcc85faf..e8f5ab22ad 100644 --- a/Source/Core/DiscIO/Src/DriveBlob.cpp +++ b/Source/Core/DiscIO/Src/DriveBlob.cpp @@ -100,9 +100,9 @@ namespace DiscIO void DriveReader::GetBlock(u64 block_num, u8 *out_ptr) { - u32 NotUsed; u8 * lpSector = new u8[m_blocksize]; #ifdef _WIN32 + u32 NotUsed; u64 offset = m_blocksize * block_num; LONG off_low = (LONG)offset & 0xFFFFFFFF; LONG off_high = (LONG)(offset >> 32); diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h index 1d9accb7d7..779c535067 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.h +++ b/Source/Core/DiscIO/Src/NANDContentLoader.h @@ -76,4 +76,5 @@ private: }
-#endif
\ No newline at end of file +#endif + |