Added ability to opt-out of file reader/writer errors

include/Athena/FileReader.hpp

@@ -13,8 +13,8 @@ namespace io
 class FileReader : public IStreamReader
 {
 public:
-    FileReader(const std::string& filename, atInt32 cacheSize = (32 * 1024));
+    FileReader(const std::string& filename, atInt32 cacheSize = (32 * 1024), bool globalErr=true);
-    FileReader(const std::wstring& filename, atInt32 cacheSize = (32 * 1024));
+    FileReader(const std::wstring& filename, atInt32 cacheSize = (32 * 1024), bool globalErr=true);
     virtual ~FileReader();
 
     inline std::string filename() const
@@ -58,6 +58,7 @@ protected:
     atInt32      m_blockSize;
     atInt32      m_curBlock;
     atUint64     m_offset;
+    bool         m_globalErr;
 };
 } // io
 } // Athena

include/Athena/FileWriter.hpp

@@ -11,8 +11,8 @@ namespace io
 class FileWriter : public IStreamWriter
 {
 public:
-    FileWriter(const std::string& filename, bool overwrite = true);
+    FileWriter(const std::string& filename, bool overwrite = true, bool globalErr=true);
-    FileWriter(const std::wstring& filename, bool overwrite = true);
+    FileWriter(const std::wstring& filename, bool overwrite = true, bool globalErr=true);
     virtual ~FileWriter();
 
     inline std::string filename() const
@@ -51,6 +51,7 @@ private:
     FILE*        m_fileHandle;
     atUint8      m_currentByte;
     atUint64     m_bytePosition;
+    bool         m_globalErr;
 };
 }
 } // Athena

include/Athena/Global.hpp

@@ -104,12 +104,12 @@ namespace Athena
 {
 namespace error
 {
-enum Level
+enum class Level
 {
-    LevelMessage,
+    Message,
-    LevelWarning,
+    Warning,
-    LevelError,
+    Error,
-    LevelFatal
+    Fatal
 };
 }
 enum SeekOrigin
@@ -126,7 +126,7 @@ enum Endian
 };
 } // Athena
 
-typedef void (*atEXCEPTION_HANDLER)(const Athena::error::Level& level, const char* file, const char* function, int line, const char* fmt, ...);
+typedef void (*atEXCEPTION_HANDLER)(Athena::error::Level level, const char* file, const char* function, int line, const char* fmt, ...);
 
 atEXCEPTION_HANDLER atGetExceptionHandler();
 void atSetExceptionHandler(atEXCEPTION_HANDLER func);
@@ -183,19 +183,19 @@ std::ostream& operator<<(std::ostream& os, const Athena::Endian& endian);
 #define atMessage(fmt...) \
     do { atEXCEPTION_HANDLER __handler = atGetExceptionHandler(); \
     if (__handler) \
-        __handler(Athena::error::LevelMessage, __FILE__, AT_PRETTY_FUNCTION, __LINE__, fmt); \
+        __handler(Athena::error::Level::Message, __FILE__, AT_PRETTY_FUNCTION, __LINE__, fmt); \
 } while(0)
 
 #define atWarning(fmt...) \
     do { atEXCEPTION_HANDLER __handler = atGetExceptionHandler(); \
     if (__handler) \
-        __handler(Athena::error::LevelWarning, __FILE__, AT_PRETTY_FUNCTION, __LINE__, fmt); \
+        __handler(Athena::error::Level::Warning, __FILE__, AT_PRETTY_FUNCTION, __LINE__, fmt); \
 } while(0)
 
 #define atError(fmt...) \
     do { atEXCEPTION_HANDLER __handler = atGetExceptionHandler(); \
     if (__handler) \
-        __handler(Athena::error::LevelError, __FILE__, AT_PRETTY_FUNCTION, __LINE__, fmt); \
+        __handler(Athena::error::Level::Error, __FILE__, AT_PRETTY_FUNCTION, __LINE__, fmt); \
 } while(0)
 
 #define atFatal(fmt...) \

src/Athena/FileReader.cpp

@@ -13,10 +13,11 @@ namespace Athena
 {
 namespace io
 {
-FileReader::FileReader(const std::string& filename, atInt32 cacheSize)
+FileReader::FileReader(const std::string& filename, atInt32 cacheSize, bool globalErr)
     : m_fileHandle(nullptr),
       m_cacheData(nullptr),
-      m_offset(0)
+      m_offset(0),
+      m_globalErr(globalErr)
 {
 #if _WIN32
     m_filename = utility::utf8ToWide(filename);
@@ -27,10 +28,11 @@ FileReader::FileReader(const std::string& filename, atInt32 cacheSize)
     setCacheSize(cacheSize);
 }
 
-FileReader::FileReader(const std::wstring& filename, atInt32 cacheSize)
+FileReader::FileReader(const std::wstring& filename, atInt32 cacheSize, bool globalErr)
     : m_fileHandle(nullptr),
       m_cacheData(nullptr),
-      m_offset(0)
+      m_offset(0),
+      m_globalErr(globalErr)
 {
 #if _WIN32
     m_filename = filename;
@@ -58,6 +60,7 @@ void FileReader::open()
     if (!m_fileHandle)
     {
         std::string _filename = filename();
+        if (m_globalErr)
             atError("File not found '%s'", _filename.c_str());
         setError();
         return;
@@ -71,6 +74,7 @@ void FileReader::close()
 {
     if (!m_fileHandle)
     {
+        if (m_globalErr)
             atError("Cannot close an unopened stream");
         setError();
         return;
@@ -105,7 +109,9 @@ void FileReader::seek(atInt64 pos, SeekOrigin origin)
         if (m_offset > length())
         {
             oldOff = m_offset;
+            if (m_globalErr)
                 atError("Unable to seek in file");
+            setError();
             return;
         }
 
@@ -118,13 +124,18 @@ void FileReader::seek(atInt64 pos, SeekOrigin origin)
         }
     }
     else if (fseeko64(m_fileHandle, pos, (int)origin) != 0)
+    {
+        if (m_globalErr)
             atError("Unable to seek in file");
+        setError();
+    }
 }
 
 atUint64 FileReader::position() const
 {
     if (!isOpen())
     {
+        if (m_globalErr)
             atError("File not open");
         return 0;
     }
@@ -139,6 +150,7 @@ atUint64 FileReader::length() const
 {
     if (!isOpen())
     {
+        if (m_globalErr)
             atError("File not open");
         return 0;
     }
@@ -154,6 +166,7 @@ atUint64 FileReader::readUBytesToBuf(void* buf, atUint64 len)
 {
     if (!isOpen())
     {
+        if (m_globalErr)
             atError("File not open for reading");
         setError();
         return 0;

src/Athena/FileWriter.cpp

@@ -13,9 +13,10 @@ namespace Athena
 {
 namespace io
 {
-FileWriter::FileWriter(const std::string& filename, bool overwrite)
+FileWriter::FileWriter(const std::string& filename, bool overwrite, bool globalErr)
     : m_fileHandle(NULL),
-      m_bytePosition(0)
+      m_bytePosition(0),
+      m_globalErr(globalErr)
 {
 #if _WIN32
     m_filename = utility::utf8ToWide(filename);
@@ -25,9 +26,10 @@ FileWriter::FileWriter(const std::string& filename, bool overwrite)
     open(overwrite);
 }
 
-FileWriter::FileWriter(const std::wstring& filename, bool overwrite)
+FileWriter::FileWriter(const std::wstring& filename, bool overwrite, bool globalErr)
     : m_fileHandle(NULL),
-      m_bytePosition(0)
+      m_bytePosition(0),
+      m_globalErr(globalErr)
 {
 #if _WIN32
     m_filename = filename;
@@ -59,6 +61,7 @@ void FileWriter::open(bool overwrite)
 
     if (!m_fileHandle)
     {
+        if (m_globalErr)
             atError("Unable to open file '%s'", filename().c_str());
         setError();
         return;
@@ -72,6 +75,7 @@ void FileWriter::close()
 {
     if (!m_fileHandle)
     {
+        if (m_globalErr)
             atError("Cannot close an unopened stream");
         setError();
         return;
@@ -86,6 +90,7 @@ void FileWriter::seek(atInt64 pos, SeekOrigin origin)
 {
     if (!isOpen())
     {
+        if (m_globalErr)
             atError("Unable to seek in file, not open");
         setError();
         return;
@@ -93,6 +98,7 @@ void FileWriter::seek(atInt64 pos, SeekOrigin origin)
 
     if (fseeko64(m_fileHandle, pos, (int)origin) != 0)
     {
+        if (m_globalErr)
             atError("Unable to seek in file");
         setError();
     }
@@ -116,6 +122,7 @@ void FileWriter::writeUBytes(const atUint8* data, atUint64 len)
 {
     if (!isOpen())
     {
+        if (m_globalErr)
             atError("File not open for writing");
         setError();
         return;
@@ -123,6 +130,7 @@ void FileWriter::writeUBytes(const atUint8* data, atUint64 len)
 
     if (fwrite(data, 1, len, m_fileHandle) != len)
     {
+        if (m_globalErr)
             atError("Unable to write to stream");
         setError();
     }

src/Athena/Global.cpp

@@ -41,18 +41,18 @@ std::ostream& operator<<(std::ostream& os, const Athena::Endian& endian)
 }
 
 
-static void __defaultExceptionHandler(const Athena::error::Level& level, const char* file, const char* function, int line, const char* fmt, ...)
+static void __defaultExceptionHandler(Athena::error::Level level, const char* file, const char* function, int line, const char* fmt, ...)
 {
     std::string levelStr;
-    switch(level)
+    switch (level)
     {
-        case Athena::error::LevelWarning:
+        case Athena::error::Level::Warning:
             levelStr = "[WARNING] ";
             break;
-        case Athena::error::LevelError:
+        case Athena::error::Level::Error:
             levelStr = "[ERROR  ] ";
             break;
-        case Athena::error::LevelFatal:
+        case Athena::error::Level::Fatal:
             levelStr = "[FATAL  ] ";
             break;
         default: break;