[Scummvm-cvs-logs] SF.net SVN: scummvm:[46379] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Dec 15 09:18:57 CET 2009


Revision: 46379
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46379&view=rev
Author:   fingolfin
Date:     2009-12-15 08:18:57 +0000 (Tue, 15 Dec 2009)

Log Message:
-----------
Got rid of ReadStream::ioFailed()

Modified Paths:
--------------
    scummvm/trunk/common/stream.h
    scummvm/trunk/engines/sci/decompressor.cpp
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/tinsel/handle.cpp
    scummvm/trunk/engines/tinsel/music.cpp
    scummvm/trunk/engines/tinsel/pcode.cpp
    scummvm/trunk/engines/tinsel/saveload.cpp
    scummvm/trunk/engines/tinsel/sound.cpp
    scummvm/trunk/engines/tinsel/strres.cpp

Modified: scummvm/trunk/common/stream.h
===================================================================
--- scummvm/trunk/common/stream.h	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/common/stream.h	2009-12-15 08:18:57 UTC (rev 46379)
@@ -177,12 +177,6 @@
 	// in general should not overload them.
 
 	/**
-	 * DEPRECATED
-	 * Default implementation for backward compatibility
-	 */
-	inline bool ioFailed() { return (eos() || err()); }
-
-	/**
 	 * Read an unsigned byte from the stream and return it.
 	 * Performs no error checking. The return value is undefined
 	 * if a read error occurred (for which client code can check by

Modified: scummvm/trunk/engines/sci/decompressor.cpp
===================================================================
--- scummvm/trunk/engines/sci/decompressor.cpp	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/engines/sci/decompressor.cpp	2009-12-15 08:18:57 UTC (rev 46379)
@@ -36,13 +36,13 @@
 namespace Sci {
 int Decompressor::unpack(Common::ReadStream *src, byte *dest, uint32 nPacked, uint32 nUnpacked) {
 	uint32 chunk;
-	while (nPacked && !src->ioFailed()) {
+	while (nPacked && !(src->eos() || src->err())) {
 		chunk = MIN<uint32>(1024, nPacked);
 		src->read(dest, chunk);
 		nPacked -= chunk;
 		dest += chunk;
 	}
-	return src->ioFailed() ? 1 : 0;
+	return (src->eos() || src->err()) ? 1 : 0;
 }
 
 void Decompressor::init(Common::ReadStream *src, byte *dest, uint32 nPacked,

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-12-15 08:18:57 UTC (rev 46379)
@@ -1016,7 +1016,7 @@
 		id = file.readUint16LE();
 		offset = file.readUint32LE();
 
-		if (file.ioFailed()) {
+		if (file.eos() || file.err()) {
 			warning("Error while reading %s", map->location_name.c_str());
 			return SCI_ERROR_RESMAP_NOT_FOUND;
 		}
@@ -1095,7 +1095,7 @@
 					// in SCI32 it's a plain offset
 				}
 			}
-			if (file.ioFailed()) {
+			if (file.eos() || file.err()) {
 				warning("Error while reading %s", map->location_name.c_str());
 				return SCI_ERROR_RESMAP_NOT_FOUND;
 			}
@@ -1278,7 +1278,7 @@
 		uint32 offset = file.readUint32LE();
 		uint32 size = file.readUint32LE();
 
-		if (file.ioFailed()) {
+		if (file.eos() || file.err()) {
 			warning("Error while reading %s", map->location_name.c_str());
 			return SCI_ERROR_RESMAP_NOT_FOUND;
 		}
@@ -1405,7 +1405,7 @@
 		return SCI_ERROR_INVALID_RESMAP_ENTRY;
 	}
 	// check if there were errors while reading
-	if (file->ioFailed())
+	if ((file->eos() || file->err()))
 		return SCI_ERROR_IO_ERROR;
 	res->id = ResourceId(type, number);
 	res->size = szUnpacked;

Modified: scummvm/trunk/engines/tinsel/handle.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/handle.cpp	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/engines/tinsel/handle.cpp	2009-12-15 08:18:57 UTC (rev 46379)
@@ -133,7 +133,7 @@
 				handleTable[i].flags2 = t2Flag ? f.readUint32LE() : 0;
 			}
 
-			if (f.ioFailed()) {
+			if (f.eos() || f.err()) {
 				// index file is corrupt
 				error(FILE_IS_CORRUPT, (TinselV1PSX? PSX_INDEX_FILENAME : INDEX_FILENAME));
 			}

Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/engines/tinsel/music.cpp	2009-12-15 08:18:57 UTC (rev 46379)
@@ -370,7 +370,7 @@
 
 	// gen length of the largest sequence
 	midiBuffer.size = midiStream.readUint32LE();
-	if (midiStream.ioFailed())
+	if (midiStream.eos() || midiStream.err())
 		error(FILE_IS_CORRUPT, MIDI_FILE);
 
 	if (midiBuffer.size) {
@@ -860,7 +860,7 @@
 			error(CANNOT_FIND_FILE, _fileName);
 
 		file.seek(sampleOffset);
-		if (file.ioFailed() || (uint32)file.pos() != sampleOffset)
+		if (file.eos() || file.err() || (uint32)file.pos() != sampleOffset)
 			error(FILE_IS_CORRUPT, _fileName);
 
 		buffer = (byte *) malloc(sampleCLength);

Modified: scummvm/trunk/engines/tinsel/pcode.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/pcode.cpp	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/engines/tinsel/pcode.cpp	2009-12-15 08:18:57 UTC (rev 46379)
@@ -406,7 +406,7 @@
 		for (int i = 0; i < length; ++i)
 			pGlobals[i] = f.readSint32LE();
 
-		if (f.ioFailed())
+		if (f.eos() || f.err())
 			error(FILE_IS_CORRUPT, GLOBALS_FILENAME);
 
 		f.close();

Modified: scummvm/trunk/engines/tinsel/saveload.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/saveload.cpp	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/engines/tinsel/saveload.cpp	2009-12-15 08:18:57 UTC (rev 46379)
@@ -467,7 +467,7 @@
 	if (id != (uint32)0xFEEDFACE)
 		error("Incompatible saved game");
 
-	bool failed = f->ioFailed();
+	bool failed = (f->eos() || f->err());
 
 	delete f;
 

Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/engines/tinsel/sound.cpp	2009-12-15 08:18:57 UTC (rev 46379)
@@ -98,12 +98,12 @@
 
 	// move to correct position in the sample file
 	_sampleStream.seek(dwSampleIndex);
-	if (_sampleStream.ioFailed() || (uint32)_sampleStream.pos() != dwSampleIndex)
+	if (_sampleStream.eos() || _sampleStream.err() || (uint32)_sampleStream.pos() != dwSampleIndex)
 		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
 
 	// read the length of the sample
 	uint32 sampleLen = _sampleStream.readUint32LE();
-	if (_sampleStream.ioFailed())
+	if (_sampleStream.eos() || _sampleStream.err())
 		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
 
 	if (TinselV1PSX) {
@@ -244,12 +244,12 @@
 
 	// move to correct position in the sample file
 	_sampleStream.seek(dwSampleIndex);
-	if (_sampleStream.ioFailed() || (uint32)_sampleStream.pos() != dwSampleIndex)
+	if (_sampleStream.eos() || _sampleStream.err() || (uint32)_sampleStream.pos() != dwSampleIndex)
 		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
 
 	// read the length of the sample
 	uint32 sampleLen = _sampleStream.readUint32LE();
-	if (_sampleStream.ioFailed())
+	if (_sampleStream.eos() || _sampleStream.err())
 		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
 
 	if (sampleLen & 0x80000000) {
@@ -263,11 +263,11 @@
 		for (int32 i = 0; i < sub; i++) {
 			sampleLen = _sampleStream.readUint32LE();
 			_sampleStream.skip(sampleLen);
-			if (_sampleStream.ioFailed())
+			if (_sampleStream.eos() || _sampleStream.err())
 				error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
 		}
 		sampleLen = _sampleStream.readUint32LE();
-		if (_sampleStream.ioFailed())
+		if (_sampleStream.eos() || _sampleStream.err())
 			error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
 	}
 
@@ -553,7 +553,7 @@
 /*
 	// gen length of the largest sample
 	sampleBuffer.size = _sampleStream.readUint32LE();
-	if (_sampleStream.ioFailed())
+	if (_sampleStream.eos() || _sampleStream.err())
 		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
 */
 }

Modified: scummvm/trunk/engines/tinsel/strres.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/strres.cpp	2009-12-14 22:29:09 UTC (rev 46378)
+++ scummvm/trunk/engines/tinsel/strres.cpp	2009-12-15 08:18:57 UTC (rev 46379)
@@ -112,7 +112,7 @@
 	// first long is the filelength and for uncompressed files it is the chunk
 	// identifier
 	textLen = f.readUint32LE();
-	if (f.ioFailed())
+	if (f.eos() || f.err())
 		error(FILE_IS_CORRUPT, _vm->getTextFile(newLang));
 
 	if (textLen == CHUNK_STRING || textLen == CHUNK_MBSTRING) {


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