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

Fixed compile warnings: name shadowing and comparing signed to unsigned (2x). 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@199 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-08-14 20:11:06 +00:00
parent 870194db21
commit 231d7ffd03
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DiscIO/Src/Blob.cpp
View File

@ -141,10 +141,10 @@ class PlainFileReader
} }
bool Read(u64 offset, u64 size, u8* out_ptr) bool Read(u64 offset, u64 nbytes, u8* out_ptr)
{ {
fseek(file_, offset, SEEK_SET); fseek(file_, offset, SEEK_SET);
fread(out_ptr, size, 1, file_); fread(out_ptr, nbytes, 1, file_);
return(true); return(true);
} }
}; };
@ -296,7 +296,7 @@ class CompressedBlobReader
z.avail_out = header.block_size; z.avail_out = header.block_size;
inflateInit(&z); inflateInit(&z);
int status = inflate(&z, Z_FULL_FLUSH); int status = inflate(&z, Z_FULL_FLUSH);
int uncomp_size = header.block_size - z.avail_out; u32 uncomp_size = header.block_size - z.avail_out;
if (status != Z_STREAM_END) if (status != Z_STREAM_END)
{ {
@ -338,7 +338,7 @@ class CompressedBlobReader
return(false); return(false);
} }
int toCopy = header.block_size - positionInBlock; u32 toCopy = header.block_size - positionInBlock;
if (toCopy >= remain) if (toCopy >= remain)
{ {