diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index fd1a3fd309..3cae155261 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -992,6 +992,36 @@ bool IOFile::Flush() { return m_good; } +std::size_t IOFile::ReadImpl(void* data, std::size_t length, std::size_t data_size) { + if (!IsOpen()) { + m_good = false; + return std::numeric_limits::max(); + } + + if (length == 0) { + return 0; + } + + DEBUG_ASSERT(data != nullptr); + + return std::fread(data, data_size, length, m_file); +} + +std::size_t IOFile::WriteImpl(const void* data, std::size_t length, std::size_t data_size) { + if (!IsOpen()) { + m_good = false; + return std::numeric_limits::max(); + } + + if (length == 0) { + return 0; + } + + DEBUG_ASSERT(data != nullptr); + + return std::fwrite(data, data_size, length, m_file); +} + bool IOFile::Resize(u64 size) { if (!IsOpen() || 0 != #ifdef _WIN32 diff --git a/src/common/file_util.h b/src/common/file_util.h index d5915b8b73..b7cbfdafde 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -273,12 +273,7 @@ public: static_assert(std::is_trivially_copyable_v, "Given array does not consist of trivially copyable objects"); - if (!IsOpen()) { - m_good = false; - return std::numeric_limits::max(); - } - - std::size_t items_read = std::fread(data, sizeof(T), length, m_file); + std::size_t items_read = ReadImpl(data, length, sizeof(T)); if (items_read != length) m_good = false; @@ -290,12 +285,7 @@ public: static_assert(std::is_trivially_copyable_v, "Given array does not consist of trivially copyable objects"); - if (!IsOpen()) { - m_good = false; - return std::numeric_limits::max(); - } - - std::size_t items_written = std::fwrite(data, sizeof(T), length, m_file); + std::size_t items_written = WriteImpl(data, length, sizeof(T)); if (items_written != length) m_good = false; @@ -349,6 +339,9 @@ public: } private: + std::size_t ReadImpl(void* data, std::size_t length, std::size_t data_size); + std::size_t WriteImpl(const void* data, std::size_t length, std::size_t data_size); + bool Open(); std::FILE* m_file = nullptr;