|
@@ -143,7 +143,15 @@ namespace bx
|
|
|
int32_t size = (int32_t)fread(_data, 1, _size, m_file);
|
|
int32_t size = (int32_t)fread(_data, 1, _size, m_file);
|
|
|
if (size != _size)
|
|
if (size != _size)
|
|
|
{
|
|
{
|
|
|
- BX_ERROR_SET(_err, BX_ERROR_READERWRITER_READ, "CrtFileReader: read failed.");
|
|
|
|
|
|
|
+ if (0 != feof(m_file) )
|
|
|
|
|
+ {
|
|
|
|
|
+ BX_ERROR_SET(_err, BX_ERROR_READERWRITER_EOF, "CrtFileWriter: EOF.");
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (0 != ferror(m_file) )
|
|
|
|
|
+ {
|
|
|
|
|
+ BX_ERROR_SET(_err, BX_ERROR_READERWRITER_READ, "CrtFileWriter: read error.");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
return size >= 0 ? size : 0;
|
|
return size >= 0 ? size : 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -257,6 +265,15 @@ namespace bx
|
|
|
int32_t size = (int32_t)fread(_data, 1, _size, m_file);
|
|
int32_t size = (int32_t)fread(_data, 1, _size, m_file);
|
|
|
if (size != _size)
|
|
if (size != _size)
|
|
|
{
|
|
{
|
|
|
|
|
+ if (0 != feof(m_file) )
|
|
|
|
|
+ {
|
|
|
|
|
+ BX_ERROR_SET(_err, BX_ERROR_READERWRITER_EOF, "CrtFileWriter: EOF.");
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (0 != ferror(m_file) )
|
|
|
|
|
+ {
|
|
|
|
|
+ BX_ERROR_SET(_err, BX_ERROR_READERWRITER_READ, "CrtFileWriter: read error.");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
return size >= 0 ? size : 0;
|
|
return size >= 0 ? size : 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -308,6 +325,11 @@ namespace bx
|
|
|
int32_t size = (int32_t)fwrite(_data, 1, _size, m_file);
|
|
int32_t size = (int32_t)fwrite(_data, 1, _size, m_file);
|
|
|
if (size != _size)
|
|
if (size != _size)
|
|
|
{
|
|
{
|
|
|
|
|
+ if (0 != ferror(m_file) )
|
|
|
|
|
+ {
|
|
|
|
|
+ BX_ERROR_SET(_err, BX_ERROR_READERWRITER_WRITE, "CrtFileWriter: write error.");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
return size >= 0 ? size : 0;
|
|
return size >= 0 ? size : 0;
|
|
|
}
|
|
}
|
|
|
|
|
|