[Scummvm-cvs-logs] SF.net SVN: scummvm: [25869] scummvm/trunk/engines/parallaction
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Feb 25 23:13:39 CET 2007
Revision: 25869
http://scummvm.svn.sourceforge.net/scummvm/?rev=25869&view=rev
Author: fingolfin
Date: 2007-02-25 14:13:38 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
Fix warnings
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/archive.cpp
scummvm/trunk/engines/parallaction/disk.h
Modified: scummvm/trunk/engines/parallaction/archive.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/archive.cpp 2007-02-25 21:40:15 UTC (rev 25868)
+++ scummvm/trunk/engines/parallaction/archive.cpp 2007-02-25 22:13:38 UTC (rev 25869)
@@ -76,16 +76,16 @@
}
-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 @@
}
-uint32 Archive::size() {
+uint32 Archive::size() const {
return (_file == true ? _fileEndOffset - _fileOffset : 0);
}
@@ -144,10 +144,10 @@
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;
}
Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h 2007-02-25 21:40:15 UTC (rev 25868)
+++ scummvm/trunk/engines/parallaction/disk.h 2007-02-25 22:13:38 UTC (rev 25869)
@@ -64,7 +64,7 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list