[Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.15,1.16
Max Horn
fingolfin at users.sourceforge.net
Tue Oct 22 04:35:04 CEST 2002
Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv22541/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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- file.cpp 21 Oct 2002 13:23:24 -0000 1.15
+++ file.cpp 22 Oct 2002 11:34:21 -0000 1.16
@@ -185,7 +185,7 @@
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 @@
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() {
More information about the Scummvm-git-logs
mailing list