ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6821 from lioncash/file 

FileUtil: Remove unnecessary IOFile GetHandle() call in ReadFileToString()
This commit is contained in:
Léo Lam 2018-05-12 12:45:44 +02:00 committed by GitHub
parent f0c5b76186 a85aa73c4d
commit 85e3e6153b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/FileUtil.cpp
View File

@ -883,16 +883,12 @@ bool WriteStringToFile(const std::string& str, const std::string& filename)
bool ReadFileToString(const std::string& filename, std::string& str) bool ReadFileToString(const std::string& filename, std::string& str)
{ {
File::IOFile file(filename, "rb"); File::IOFile file(filename, "rb");
auto const f = file.GetHandle();
if (!f) if (!file)
return false; return false;
size_t read_size; str.resize(file.GetSize());
str.resize(GetSize(f)); return file.ReadArray(&str[0], str.size());
bool retval = file.ReadArray(&str[0], str.size(), &read_size);
return retval;
} }
} // namespace File } // namespace File