diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2018-09-29 22:57:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 22:57:05 -0700 |
| commit | cd29cdb5846354dfd050836d3db0d72c0e29efe8 (patch) | |
| tree | f4deb19438d1bc232f96299fd54a463659d45c22 /Source/Core/Common/File.h | |
| parent | 61e6729ce98be2add5025cfd4650001553f80289 (diff) | |
| parent | d594d4f12fb349807202f30aaeb23bcd68a29ce0 (diff) | |
Merge pull request #6020 from shuffle2/fix-sram
Fix sram accesses.
Diffstat (limited to 'Source/Core/Common/File.h')
| -rw-r--r-- | Source/Core/Common/File.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Common/File.h b/Source/Core/Common/File.h index b92cc309a5..01b59af257 100644 --- a/Source/Core/Common/File.h +++ b/Source/Core/Common/File.h @@ -36,22 +36,22 @@ public: bool Close(); template <typename T> - bool ReadArray(T* data, size_t length, size_t* pReadBytes = nullptr) + bool ReadArray(T* elements, size_t count, size_t* num_read = nullptr) { - size_t read_bytes = 0; - if (!IsOpen() || length != (read_bytes = std::fread(data, sizeof(T), length, m_file))) + size_t read_count = 0; + if (!IsOpen() || count != (read_count = std::fread(elements, sizeof(T), count, m_file))) m_good = false; - if (pReadBytes) - *pReadBytes = read_bytes; + if (num_read) + *num_read = read_count; return m_good; } template <typename T> - bool WriteArray(const T* data, size_t length) + bool WriteArray(const T* elements, size_t count) { - if (!IsOpen() || length != std::fwrite(data, sizeof(T), length, m_file)) + if (!IsOpen() || count != std::fwrite(elements, sizeof(T), count, m_file)) m_good = false; return m_good; |
