artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Common: Return the number of items read/written in IOFile’s methods instead of a boolean.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2014-09-12 00:16:54 +02:00
parent 1c79a4f10c
commit edaf59a759
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/common/file_util.h
View file

@ -151,29 +151,41 @@ public:
bool Close(); bool Close();
template <typename T> template <typename T>
bool ReadArray(T* data, size_t length) size_t ReadArray(T* data, size_t length)
{ {
if (!IsOpen() || length != std::fread(data, sizeof(T), length, m_file)) if (!IsOpen()) {
m_good = false;
return -1;
}
size_t items_read = std::fread(data, sizeof(T), length, m_file);
if (items_read != length)
m_good = false; m_good = false;
return m_good; return items_read;
} }
template <typename T> template <typename T>
bool WriteArray(const T* data, size_t length) size_t WriteArray(const T* data, size_t length)
{ {
if (!IsOpen() || length != std::fwrite(data, sizeof(T), length, m_file)) if (!IsOpen()) {
m_good = false;
return -1;
}
size_t items_written = std::fwrite(data, sizeof(T), length, m_file);
if (items_written != length)
m_good = false; m_good = false;
return m_good; return items_written;
} }
bool ReadBytes(void* data, size_t length) size_t ReadBytes(void* data, size_t length)
{ {
return ReadArray(reinterpret_cast<char*>(data), length); return ReadArray(reinterpret_cast<char*>(data), length);
} }
bool WriteBytes(const void* data, size_t length) size_t WriteBytes(const void* data, size_t length)
{ {
return WriteArray(reinterpret_cast<const char*>(data), length); return WriteArray(reinterpret_cast<const char*>(data), length);
} }