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

[fingolfin at users.sourceforge.net]

Revision: 42501
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42501&view=rev
Author:   fingolfin
Date:     2009-07-15 10:04:50 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
Got rid of two more ioFailed uses

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/resource.cpp
    scummvm/trunk/sound/aiff.cpp

Modified: scummvm/trunk/engines/groovie/resource.cpp
===================================================================
--- scummvm/trunk/engines/groovie/resource.cpp	2009-07-15 08:55:12 UTC (rev 42500)
+++ scummvm/trunk/engines/groovie/resource.cpp	2009-07-15 10:04:50 UTC (rev 42501)
@@ -98,7 +98,7 @@
 
 	uint16 resNum;
 	bool found = false;
-	for (resNum = 0; !found && !rlFile.ioFailed(); resNum++) {
+	for (resNum = 0; !found && !rlFile.err() && !rlFile.eos(); resNum++) {
 		// Read the resource name
 		char readname[12];
 		rlFile.read(readname, 12);

Modified: scummvm/trunk/sound/aiff.cpp
===================================================================
--- scummvm/trunk/sound/aiff.cpp	2009-07-15 08:55:12 UTC (rev 42500)
+++ scummvm/trunk/sound/aiff.cpp	2009-07-15 10:04:50 UTC (rev 42501)
@@ -94,7 +94,7 @@
 	uint16 numChannels = 0, bitsPerSample = 0;
 	uint32 numSampleFrames = 0, offset = 0, blockSize = 0, soundOffset = 0;
 
-	while ((!foundCOMM || !foundSSND) && !stream.ioFailed()) {
+	while (!(foundCOMM && foundSSND) && !stream.err() && !stream.eos()) {
 		uint32 length, pos;
 
 		stream.read(buf, 4);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.