libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 01:39:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split _eof vs. _err.

Browse Source 
Latter defaults to false for now, there are hooks
for possible future implementation.

svn-id: r42428
This commit is contained in:
Max Lingua 2009-07-12 21:58:00 +00:00
parent bd91c1129d
commit a0c3754971
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backends/platform/ps2/fileio.cpp
View File

@ -58,6 +58,7 @@ Ps2File::Ps2File(void) {
_cacheSize = 0;
_cachePos = 0;
_eof = false;
_err = false;
// _cache = (uint8 *)malloc(PS2_CACHE_MAX);
@ -224,10 +225,11 @@ bool Ps2File::eof(void) {
}
bool Ps2File::getErr(void) {
return _eof;
return _err;
}
void Ps2File::setErr(bool err) {
_err = err;
_eof = err;
}
@ -261,7 +263,9 @@ int Ps2File::seek(int32 offset, int origin) {
_eof = false;
res = 0;
}
else _eof = true;
else {
_eof = true;
}
// printf("seek [%d] %d %d\n", _fd, offset, origin);
// printf(" res = %d\n", res);
@ -350,10 +354,17 @@ uint32 Ps2File::read(void *dest, uint32 len) {
printf("read (1) : _cachePos = %d\n", _cachePos);
#endif
if (len == 0) {
#ifdef __PS2_FILE_SEMA__
SignalSema(_sema);
#endif
return 0;
}
if (_filePos >= _fileSize) {
_eof = true;
#ifdef __PS2_FILE_SEMA__
SignalSema(_sema);
SignalSema(_sema);
#endif
return 0;
}
@ -526,11 +537,11 @@ int ps2_fflush(FILE *stream) {
int ps2_ferror(FILE *stream) {
int err = ((Ps2File*)stream)->getErr();
if (err)
if (err) {
printf("ferror -> %d\n", err);
}
return 0; // kyra temp
// return err;
return err;
}
void ps2_clearerr(FILE *stream) {

3
backends/platform/ps2/fileio.h
View File

@ -70,7 +70,8 @@ private:
uint8 *_cache;
int _eof;
bool _eof;
bool _err;
int _sema;