From 231d7ffd03e62cb8b541ff4d411929e6760016b2 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Thu, 14 Aug 2008 20:11:06 +0000
Subject: [PATCH] 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
---
 Source/Core/DiscIO/Src/Blob.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Core/DiscIO/Src/Blob.cpp b/Source/Core/DiscIO/Src/Blob.cpp
index 456f85f307..dcbf4d7a07 100644
--- a/Source/Core/DiscIO/Src/Blob.cpp
+++ b/Source/Core/DiscIO/Src/Blob.cpp
@@ -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);
-			fread(out_ptr, size, 1, file_);
+			fread(out_ptr, nbytes, 1, file_);
 			return(true);
 		}
 };
@@ -296,7 +296,7 @@ class CompressedBlobReader
 					z.avail_out = header.block_size;
 					inflateInit(&z);
 					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)
 					{
@@ -338,7 +338,7 @@ class CompressedBlobReader
 					return(false);
 				}
 
-				int toCopy = header.block_size - positionInBlock;
+				u32 toCopy = header.block_size - positionInBlock;
 
 				if (toCopy >= remain)
 				{