[Scummvm-cvs-logs] CVS: scummvm/scumm util.h,2.9,2.10 util.cpp,2.9,2.10

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30031/scumm

Modified Files:
	util.h util.cpp 
Log Message:
Fixed some doxygen warnings

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.h,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- util.h	28 Apr 2005 21:02:43 -0000	2.9
+++ util.h	5 May 2005 15:59:22 -0000	2.10
@@ -38,8 +38,8 @@
 	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 @@
 	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 @@
 	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);
 };
 
 

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.cpp,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- util.cpp	28 Apr 2005 21:02:42 -0000	2.9
+++ util.cpp	5 May 2005 15:59:22 -0000	2.10
@@ -151,28 +151,28 @@
 	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;