aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-02-25 22:13:38 +0000
committerMax Horn2007-02-25 22:13:38 +0000
commitd74a33942410fbf6b38fc04cbb867baf659ca775 (patch)
treec6de3a2b55a10d45278373c23bfe2fcf8ecf0564
parentc7734857e1d9d7b9174e9b62de373fb5166ff0f6 (diff)
downloadscummvm-rg350-d74a33942410fbf6b38fc04cbb867baf659ca775.tar.gz
scummvm-rg350-d74a33942410fbf6b38fc04cbb867baf659ca775.tar.bz2
scummvm-rg350-d74a33942410fbf6b38fc04cbb867baf659ca775.zip
Fix warnings
svn-id: r25869
-rw-r--r--engines/parallaction/archive.cpp14
-rw-r--r--engines/parallaction/disk.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/parallaction/archive.cpp b/engines/parallaction/archive.cpp
index e83bcecc13..c8f5f4903f 100644
--- a/engines/parallaction/archive.cpp
+++ b/engines/parallaction/archive.cpp
@@ -76,16 +76,16 @@ void Archive::close() {
}
-bool Archive::openArchivedFile(const char *name) {
+bool Archive::openArchivedFile(const char *filename) {
resetArchivedFile();
uint16 i = 0;
for ( ; i < MAX_ARCHIVE_ENTRIES; i++) {
- if (!scumm_stricmp(_archiveDir[i], name)) break;
+ if (!scumm_stricmp(_archiveDir[i], filename)) break;
}
if (i == MAX_ARCHIVE_ENTRIES) return false;
- debugC(1, kDebugDisk, "file '%s' found in slot %i", name, i);
+ debugC(1, kDebugDisk, "file '%s' found in slot %i", filename, i);
_file = true;
@@ -110,7 +110,7 @@ void Archive::closeArchivedFile() {
}
-uint32 Archive::size() {
+uint32 Archive::size() const {
return (_file == true ? _fileEndOffset - _fileOffset : 0);
}
@@ -144,10 +144,10 @@ uint32 Archive::read(void *dataPtr, uint32 dataSize) {
if (_fileEndOffset - _fileCursor < dataSize)
dataSize = _fileEndOffset - _fileCursor;
- int32 read = _archive.read(dataPtr, dataSize);
- _fileCursor += read;
+ int32 readBytes = _archive.read(dataPtr, dataSize);
+ _fileCursor += readBytes;
- return read;
+ return readBytes;
}
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 033f89efcc..aee57cb487 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -64,7 +64,7 @@ public:
bool openArchivedFile(const char *name);
void closeArchivedFile();
- uint32 size();
+ uint32 size() const;
void seek(int32 offs, int whence = SEEK_SET);
uint32 read(void *dataPtr, uint32 dataSize);