libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Global error option flag for MemoryReader

This commit is contained in:
Jack Andersen 2016-08-08 08:22:03 -10:00
parent 750d23c686
commit b43c4af3a7
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/athena/MemoryReader.hpp
View File

@ -31,7 +31,7 @@ public:
* \param length The length of the existing buffer * \param length The length of the existing buffer
* \param takeOwnership Memory will be freed with the reader if set * \param takeOwnership Memory will be freed with the reader if set
*/ */
MemoryReader(const void* data, atUint64 length, bool takeOwnership=false); MemoryReader(const void* data, atUint64 length, bool takeOwnership=false, bool globalErr=true);
/*! \brief Sets the buffers position relative to the specified position.<br /> /*! \brief Sets the buffers position relative to the specified position.<br />
* It seeks relative to the current position by default. * It seeks relative to the current position by default.
@ -89,6 +89,7 @@ protected:
atUint64 m_length = 0; atUint64 m_length = 0;
atUint64 m_position = 0; atUint64 m_position = 0;
bool m_owns = false; bool m_owns = false;
bool m_globalErr = true;
}; };
class MemoryCopyReader : public MemoryReader class MemoryCopyReader : public MemoryReader

35
src/athena/MemoryReader.cpp
View File

@ -14,22 +14,25 @@ namespace athena
{ {
namespace io namespace io
{ {
MemoryReader::MemoryReader(const void* data, atUint64 length, bool takeOwnership) MemoryReader::MemoryReader(const void* data, atUint64 length, bool takeOwnership, bool globalErr)
: m_data(data), : m_data(data),
m_length(length), m_length(length),
m_position(0), m_position(0),
m_owns(takeOwnership) m_owns(takeOwnership),
m_globalErr(globalErr)
{ {
if (!data) if (!data)
{ {
atError("data cannot be NULL"); if (m_globalErr)
atError("data cannot be NULL");
setError(); setError();
return; return;
} }
if (length == 0) if (length == 0)
{ {
atError("length cannot be 0"); if (m_globalErr)
atError("length cannot be 0");
setError(); setError();
return; return;
} }
@ -46,14 +49,16 @@ MemoryCopyReader::MemoryCopyReader(const void* data, atUint64 length)
{ {
if (!data) if (!data)
{ {
atError("data cannot be NULL"); if (m_globalErr)
atError("data cannot be NULL");
setError(); setError();
return; return;
} }
if (length == 0) if (length == 0)
{ {
atError("length cannot be 0"); if (m_globalErr)
atError("length cannot be 0");
setError(); setError();
return; return;
} }
@ -70,7 +75,8 @@ void MemoryReader::seek(atInt64 position, SeekOrigin origin)
case SeekOrigin::Begin: case SeekOrigin::Begin:
if ((position < 0 || (atInt64)position > (atInt64)m_length)) if ((position < 0 || (atInt64)position > (atInt64)m_length))
{ {
atError("Position %0.8X outside stream bounds ", position); if (m_globalErr)
atError("Position %0.8X outside stream bounds ", position);
setError(); setError();
return; return;
} }
@ -81,7 +87,8 @@ void MemoryReader::seek(atInt64 position, SeekOrigin origin)
case SeekOrigin::Current: case SeekOrigin::Current:
if ((((atInt64)m_position + position) < 0 || (m_position + position) > m_length)) if ((((atInt64)m_position + position) < 0 || (m_position + position) > m_length))
{ {
atError("Position %0.8X outside stream bounds ", position); if (m_globalErr)
atError("Position %0.8X outside stream bounds ", position);
setError(); setError();
return; return;
} }
@ -92,7 +99,8 @@ void MemoryReader::seek(atInt64 position, SeekOrigin origin)
case SeekOrigin::End: case SeekOrigin::End:
if ((((atInt64)m_length - position < 0) || (m_length - position) > m_length)) if ((((atInt64)m_length - position < 0) || (m_length - position) > m_length))
{ {
atError("Position %0.8X outside stream bounds ", position); if (m_globalErr)
atError("Position %0.8X outside stream bounds ", position);
setError(); setError();
return; return;
} }
@ -133,7 +141,8 @@ atUint64 MemoryReader::readUBytesToBuf(void* buf, atUint64 length)
{ {
if (m_position + length > m_length) if (m_position + length > m_length)
{ {
atError("Position %0.8X outside stream bounds ", m_position); if (m_globalErr)
atError("Position %0.8X outside stream bounds ", m_position);
setError(); setError();
return 0; return 0;
} }
@ -151,7 +160,8 @@ void MemoryCopyReader::loadData()
if (!in) if (!in)
{ {
atError("Unable to open file '%s'", m_filepath.c_str()); if (m_globalErr)
atError("Unable to open file '%s'", m_filepath.c_str());
setError(); setError();
return; return;
} }
@ -174,7 +184,8 @@ void MemoryCopyReader::loadData()
if (ret < 0) if (ret < 0)
{ {
atError("Error reading data from disk"); if (m_globalErr)
atError("Error reading data from disk");
setError(); setError();
return; return;
} }