Big patch changing semantics of ReadStream::eos():

eos() now only returns true _after_ trying to read past the end of the stream.

This has a large potential for regressions. Please test!

svn-id: r34549

4 files changed, 11 insertions, 10 deletions

diff --git a/backends/fs/stdiostream.cpp b/backends/fs/stdiostream.cpp
index fafcca989b..4f353ee7c2 100644
--- a/backends/fs/stdiostream.cpp
+++ b/backends/fs/stdiostream.cpp
@@ -114,11 +114,11 @@ StdioStream::~StdioStream() {
 	fclose((FILE *)_handle);
 }
 
-bool StdioStream::ioFailed() const {
-	return eos() || ferror((FILE *)_handle) != 0;
+bool StdioStream::err() const {
+	return ferror((FILE *)_handle) != 0;
 }
 
-void StdioStream::clearIOFailed() {
+void StdioStream::clearErr() {
 	clearerr((FILE *)_handle);
 }
 
diff --git a/backends/fs/stdiostream.h b/backends/fs/stdiostream.h
index f40ddd9867..3d44062d7f 100644
--- a/backends/fs/stdiostream.h
+++ b/backends/fs/stdiostream.h
@@ -46,8 +46,8 @@ public:
 	StdioStream(void *handle);
 	virtual ~StdioStream();
 
-	bool ioFailed() const;
-	void clearIOFailed();
+	bool err() const;
+	void clearErr();
 	bool eos() const;
 
 	virtual uint32 write(const void *dataPtr, uint32 dataSize);
diff --git a/backends/fs/symbian/symbianstream.cpp b/backends/fs/symbian/symbianstream.cpp
index 4d2ec11ab3..5944cab892 100644
--- a/backends/fs/symbian/symbianstream.cpp
+++ b/backends/fs/symbian/symbianstream.cpp
@@ -177,12 +177,13 @@ SymbianStdioStream::~SymbianStdioStream() {
 	delete (TSymbianFileEntry*)(_handle);
 }
 
-bool SymbianStdioStream::ioFailed() const {
-	return eos() || ((TSymbianFileEntry*)(_handle))->_lastError != 0;
+bool SymbianStdioStream::err() const {
+	return ((TSymbianFileEntry*)(_handle))->_lastError != 0;
 }
 
-void SymbianStdioStream::clearIOFailed() {
+void SymbianStdioStream::clearErr() {
 	((TSymbianFileEntry*)(_handle))->_lastError = 0;
+	((TSymbianFileEntry*)(_handle))->_eofReached = 0;
 }
 
 bool SymbianStdioStream::eos() const {
diff --git a/backends/fs/symbian/symbianstream.h b/backends/fs/symbian/symbianstream.h
index 180e6bffcb..d783856687 100644
--- a/backends/fs/symbian/symbianstream.h
+++ b/backends/fs/symbian/symbianstream.h
@@ -46,8 +46,8 @@ public:
 	SymbianStdioStream(void *handle);
 	virtual ~SymbianStdioStream();
 
-	bool ioFailed() const;
-	void clearIOFailed();
+	bool err() const;
+	void clearErr();
 	bool eos() const;
 
 	virtual uint32 write(const void *dataPtr, uint32 dataSize);