[Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.16,1.17

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv24015/common

Modified Files:
	file.cpp 
Log Message:
don't shadow vars

Index: file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- file.cpp	22 Oct 2002 11:34:21 -0000	1.16
+++ file.cpp	22 Oct 2002 11:35:45 -0000	1.17
@@ -245,7 +245,7 @@
 	return (b << 16) | a;
 }
 
-uint32 File::write(void *ptr, uint32 size) {
+uint32 File::write(void *ptr, uint32 len) {
 	byte *ptr2 = (byte *)ptr;
 
 	if (_handle == NULL) {
@@ -253,22 +253,22 @@
 		return 0;
 	}
 
-	if (size == 0)
+	if (len == 0)
 		return 0;
 
 	if (_encbyte != 0) {
-		uint32 t_size = size;
+		uint32 t_size = len;
 		do {
 			*ptr2++ ^= _encbyte;
 		} while (--t_size);
 	}
 
-	if ((uint32)fwrite(ptr2, 1, size, _handle) != size) {
+	if ((uint32)fwrite(ptr2, 1, len, _handle) != len) {
 		clearerr(_handle);
 		_ioFailed = true;
 	}
 
-	return size;
+	return len;
 }
 
 void File::writeByte(byte value) {