summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-04-17 23:02:35 +0200
committerGitHub <noreply@github.com>2020-04-17 23:02:35 +0200
commit775ecc7d055ff0fe0b9cfad7485581b64a1d8762 (patch)
tree0dc512381d80077409a02f0b10e43f22586e9466 /src/common
parentMerge pull request #3666 from bunnei/new-vmm (diff)
parentfile_util: Early-exit in WriteArray and ReadArray if specified lengths are zero (diff)
downloadyuzu-775ecc7d055ff0fe0b9cfad7485581b64a1d8762.tar
yuzu-775ecc7d055ff0fe0b9cfad7485581b64a1d8762.tar.gz
yuzu-775ecc7d055ff0fe0b9cfad7485581b64a1d8762.tar.bz2
yuzu-775ecc7d055ff0fe0b9cfad7485581b64a1d8762.tar.lz
yuzu-775ecc7d055ff0fe0b9cfad7485581b64a1d8762.tar.xz
yuzu-775ecc7d055ff0fe0b9cfad7485581b64a1d8762.tar.zst
yuzu-775ecc7d055ff0fe0b9cfad7485581b64a1d8762.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/file_util.cpp28
-rw-r--r--src/common/file_util.h14
2 files changed, 33 insertions, 9 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 35eee0096..7f613891b 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -967,6 +967,34 @@ bool IOFile::Flush() {
return IsOpen() && 0 == std::fflush(m_file);
}
+std::size_t IOFile::ReadImpl(void* data, std::size_t length, std::size_t data_size) const {
+ if (!IsOpen()) {
+ return std::numeric_limits<std::size_t>::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()) {
+ return std::numeric_limits<std::size_t>::max();
+ }
+
+ if (length == 0) {
+ return 0;
+ }
+
+ DEBUG_ASSERT(data != nullptr);
+
+ return std::fwrite(data, data_size, length, m_file);
+}
+
bool IOFile::Resize(u64 size) {
return IsOpen() && 0 ==
#ifdef _WIN32
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;
};