diff options
author | Max Horn | 2005-05-05 15:59:24 +0000 |
---|---|---|
committer | Max Horn | 2005-05-05 15:59:24 +0000 |
commit | d00117ec4bdc0b8c79854ba8e9fbd50ecb4acda9 (patch) | |
tree | 554ca00f5a8cb13cfae3b6f3b74181754a910af8 /scumm | |
parent | c16cceafad7aa370cacf6598b2fac24bf8337794 (diff) | |
download | scummvm-rg350-d00117ec4bdc0b8c79854ba8e9fbd50ecb4acda9.tar.gz scummvm-rg350-d00117ec4bdc0b8c79854ba8e9fbd50ecb4acda9.tar.bz2 scummvm-rg350-d00117ec4bdc0b8c79854ba8e9fbd50ecb4acda9.zip |
Fixed some doxygen warnings
svn-id: r17923
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/util.cpp | 10 | ||||
-rw-r--r-- | scumm/util.h | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/scumm/util.cpp b/scumm/util.cpp index 2df1c8193b..aa8b9d0a45 100644 --- a/scumm/util.cpp +++ b/scumm/util.cpp @@ -151,28 +151,28 @@ void ScummFile::seek(int32 offs, int whence) { File::seek(offs, whence); } -uint32 ScummFile::read(void *ptr, uint32 len) { +uint32 ScummFile::read(void *dataPtr, uint32 dataSize) { uint32 realLen; if (_subFileLen) { // Limit the amount we read by the subfile boundaries. const uint32 curPos = pos(); assert(_subFileLen >= curPos); - uint32 newPos = curPos + len; + uint32 newPos = curPos + dataSize; if (newPos > _subFileLen) { - len = _subFileLen - curPos; + dataSize = _subFileLen - curPos; _ioFailed = true; } } - realLen = File::read(ptr, len); + realLen = File::read(dataPtr, dataSize); // If an encryption byte was specified, XOR the data we just read by it. // This simple kind of "encryption" was used by some of the older SCUMM // games. if (_encbyte) { - byte *p = (byte *)ptr; + byte *p = (byte *)dataPtr; byte *end = p + realLen; while (p < end) *p++ ^= _encbyte; diff --git a/scumm/util.h b/scumm/util.h index c2d3af92cb..7fbf4035dd 100644 --- a/scumm/util.h +++ b/scumm/util.h @@ -38,8 +38,8 @@ public: virtual uint32 pos() = 0; virtual uint32 size() = 0; virtual void seek(int32 offs, int whence = SEEK_SET) = 0; - virtual uint32 read(void *ptr, uint32 size) = 0; - virtual uint32 write(const void *ptr, uint32 size) = 0; + virtual uint32 read(void *dataPtr, uint32 dataSize) = 0; + virtual uint32 write(const void *dataPtr, uint32 dataSize) = 0; }; class ScummFile : public BaseScummFile { @@ -61,8 +61,8 @@ public: uint32 pos(); uint32 size(); void seek(int32 offs, int whence = SEEK_SET); - uint32 read(void *ptr, uint32 size); - uint32 write(const void *ptr, uint32 size); + uint32 read(void *dataPtr, uint32 dataSize); + uint32 write(const void *dataPtr, uint32 dataSize); }; class ScummNESFile : public BaseScummFile { @@ -104,8 +104,8 @@ public: uint32 pos() { return _stream->pos(); } uint32 size() { return _stream->size(); } void seek(int32 offs, int whence = SEEK_SET) { _stream->seek(offs, whence); } - uint32 read(void *ptr, uint32 len) { return _stream->read(ptr, len); } - uint32 write(const void *ptr, uint32 size); + uint32 read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); } + uint32 write(const void *dataPtr, uint32 dataSize); }; |