diff options
| author | Max Horn | 2002-10-22 11:34:21 +0000 |
|---|---|---|
| committer | Max Horn | 2002-10-22 11:34:21 +0000 |
| commit | 060ded9ee7c2557e1e5d7abd2819a38d17f93001 (patch) | |
| tree | b0662e81dedfe3da12ac8c34dee04b1b326f88b0 /common/file.cpp | |
| parent | 132bf1b74e3456d214cbd6ea0d9d609430b8dd89 (diff) | |
| download | scummvm-rg350-060ded9ee7c2557e1e5d7abd2819a38d17f93001.tar.gz scummvm-rg350-060ded9ee7c2557e1e5d7abd2819a38d17f93001.tar.bz2 scummvm-rg350-060ded9ee7c2557e1e5d7abd2819a38d17f93001.zip | |
don't shadow vars
svn-id: r5236
Diffstat (limited to 'common/file.cpp')
| -rw-r--r-- | common/file.cpp | 10 |
1 files changed, 5 insertions, 5 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() { |