From a85aa73c4d5e7b37856912925bf5dc9a8bcb38b4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 11 May 2018 16:22:23 -0400 Subject: [PATCH] FileUtil: Remove unnecessary IOFile GetHandle() call in ReadFileToString() We can just use IOFile's GetSize() function to do the same thing. While we're at it, get rid of unnecessary variables. --- Source/Core/Common/FileUtil.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 66f1decdc5..3b8ea2a84e 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -883,16 +883,12 @@ bool WriteStringToFile(const std::string& str, const std::string& filename) bool ReadFileToString(const std::string& filename, std::string& str) { File::IOFile file(filename, "rb"); - auto const f = file.GetHandle(); - if (!f) + if (!file) return false; - size_t read_size; - str.resize(GetSize(f)); - bool retval = file.ReadArray(&str[0], str.size(), &read_size); - - return retval; + str.resize(file.GetSize()); + return file.ReadArray(&str[0], str.size()); } } // namespace File