[Scummvm-cvs-logs] CVS: scummvm sys.cpp,1.6,1.7

[Drigo Zoxx]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv22458

Modified Files:
	sys.cpp 
Log Message:
clearerr added into disk reading operations to recover from wrong actions (which sometimes occurs)

Index: sys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sys.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sys.cpp	23 Jan 2002 17:26:01 -0000	1.6
--- sys.cpp	9 Mar 2002 13:51:37 -0000	1.7
***************
*** 63,67 ****
  	switch(_fileMode) {
  	case 1: case 2:
! 		fseek((FILE*)file, offs, whence);
  		return;
  	case 3:
--- 63,68 ----
  	switch(_fileMode) {
  	case 1: case 2:
! 		if (fseek((FILE*)file, offs, whence)!=0)
! 			clearerr((FILE*)file);
  		return;
  	case 3:
***************
*** 79,84 ****
  			return;
  
! 		if ((uint32)fread(ptr2, size, 1, (FILE*)file) != 1)
  			_fileReadFailed = true;
  
  		do {
--- 80,87 ----
  			return;
  
! 		if ((uint32)fread(ptr2, size, 1, (FILE*)file) != 1) {
! 			clearerr((FILE*)file);
  			_fileReadFailed = true;
+ 		}
  
  		do {
***************
*** 107,112 ****
  	switch(_fileMode) {
  	case 1:
! 		if (fread(&b,1,1,(FILE*)_fileHandle) != 1)
  			_fileReadFailed = true;
  		return b ^ _encbyte;
  
--- 110,117 ----
  	switch(_fileMode) {
  	case 1:
! 		if (fread(&b,1,1,(FILE*)_fileHandle) != 1) {
! 			clearerr((FILE*)_fileHandle);
  			_fileReadFailed = true;
+ 		}
  		return b ^ _encbyte;