don't shadow vars

svn-id: r5236

2 files changed, 7 insertions, 7 deletions

diff --git a/common/file.cpp b/common/file.cpp
index c2459abb56..0ece3da29c 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -185,7 +185,7 @@ void File::seek(int32 offs, int whence) {
 		clearerr(_handle);
 }
 
-uint32 File::read(void *ptr, uint32 size) {
+uint32 File::read(void *ptr, uint32 len) {
 	byte *ptr2 = (byte *)ptr;
 
 	if (_handle == NULL) {
@@ -193,22 +193,22 @@ uint32 File::read(void *ptr, uint32 size) {
 		return 0;
 	}
 
-	if (size == 0)
+	if (len == 0)
 		return 0;
 
-	if ((uint32)fread(ptr2, 1, size, _handle) != size) {
+	if ((uint32)fread(ptr2, 1, len, _handle) != len) {
 		clearerr(_handle);
 		_ioFailed = true;
 	}
 
 	if (_encbyte != 0) {
-		uint32 t_size = size;
+		uint32 t_size = len;
 		do {
 			*ptr2++ ^= _encbyte;
 		} while (--t_size);
 	}
 
-	return size;
+	return len;
 }
 
 byte File::readByte() {
diff --git a/common/map.h b/common/map.h
index 6e1a67e954..51e87210ef 100644
--- a/common/map.h
+++ b/common/map.h
@@ -177,8 +177,8 @@ public:
 		// different walk order (infix comes to mind).
 		if (map.isEmpty())
 			return;
-		Iterator x(map.begin()), end(map.end());
-		for (; x != end; ++x) {
+		Iterator x(map.begin()), e(map.end());
+		for (; x != e; ++x) {
 			(*this)[x->_key] = x->_value;
 		}
 	}