diff options
author | Lioncash <mathew1800@gmail.com> | 2020-04-15 20:21:22 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-04-15 20:43:37 +0200 |
commit | e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c (patch) | |
tree | 0b6d9732e5276abf734e64dcd708a18da1e931a4 /src/common/file_util.h | |
parent | Merge pull request #3662 from ReinUsesLisp/constant-attrs (diff) | |
download | yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.tar yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.tar.gz yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.tar.bz2 yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.tar.lz yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.tar.xz yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.tar.zst yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/file_util.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h index cde7ddf2d..f7a0c33fa 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -222,22 +222,15 @@ public: static_assert(std::is_trivially_copyable_v<T>, "Given array does not consist of trivially copyable objects"); - if (!IsOpen()) { - return std::numeric_limits<std::size_t>::max(); - } - - return std::fread(data, sizeof(T), length, m_file); + return ReadImpl(data, length, sizeof(T)); } template <typename T> std::size_t WriteArray(const T* data, std::size_t length) { static_assert(std::is_trivially_copyable_v<T>, "Given array does not consist of trivially copyable objects"); - if (!IsOpen()) { - return std::numeric_limits<std::size_t>::max(); - } - return std::fwrite(data, sizeof(T), length, m_file); + return WriteImpl(data, length, sizeof(T)); } template <typename T> @@ -278,6 +271,9 @@ public: } private: + std::size_t ReadImpl(void* data, std::size_t length, std::size_t data_size) const; + std::size_t WriteImpl(const void* data, std::size_t length, std::size_t data_size); + std::FILE* m_file = nullptr; }; |