summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2018-08-07 13:47:14 -0400
committerGravatar Lioncash2018-08-07 13:51:37 -0400
commit0735a0c8a11e62bbe0c7bed52c7c8a9a861b5ce4 (patch)
tree5224ed7992e75c4f1b7c4b37caccff58029c3bb4 /src
parentMerge pull request #952 from lioncash/usb (diff)
downloadyuzu-0735a0c8a11e62bbe0c7bed52c7c8a9a861b5ce4.tar.gz
yuzu-0735a0c8a11e62bbe0c7bed52c7c8a9a861b5ce4.tar.xz
yuzu-0735a0c8a11e62bbe0c7bed52c7c8a9a861b5ce4.zip
file_util: Avoid sign-conversions in WriteArray() and ReadArray()
Prevents compiler warnings.
Diffstat (limited to 'src')
-rw-r--r--src/common/file_util.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 28697d527..430dac41c 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -8,6 +8,7 @@
8#include <cstdio> 8#include <cstdio>
9#include <fstream> 9#include <fstream>
10#include <functional> 10#include <functional>
11#include <limits>
11#include <string> 12#include <string>
12#include <string_view> 13#include <string_view>
13#include <type_traits> 14#include <type_traits>
@@ -210,8 +211,9 @@ public:
210 static_assert(std::is_trivially_copyable<T>(), 211 static_assert(std::is_trivially_copyable<T>(),
211 "Given array does not consist of trivially copyable objects"); 212 "Given array does not consist of trivially copyable objects");
212 213
213 if (!IsOpen()) 214 if (!IsOpen()) {
214 return -1; 215 return std::numeric_limits<size_t>::max();
216 }
215 217
216 return std::fread(data, sizeof(T), length, m_file); 218 return std::fread(data, sizeof(T), length, m_file);
217 } 219 }
@@ -220,8 +222,10 @@ public:
220 size_t WriteArray(const T* data, size_t length) { 222 size_t WriteArray(const T* data, size_t length) {
221 static_assert(std::is_trivially_copyable<T>(), 223 static_assert(std::is_trivially_copyable<T>(),
222 "Given array does not consist of trivially copyable objects"); 224 "Given array does not consist of trivially copyable objects");
223 if (!IsOpen()) 225 if (!IsOpen()) {
224 return -1; 226 return std::numeric_limits<size_t>::max();
227 }
228
225 return std::fwrite(data, sizeof(T), length, m_file); 229 return std::fwrite(data, sizeof(T), length, m_file);
226 } 230 }
227 231