diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-05-23 13:52:40 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-05-23 13:52:43 -0400 |
| commit | 2b1fcc8a14d93c16ce00e1a9888e3f4f839f18f9 (patch) | |
| tree | 129596d2ff096166c68af0f39ebf6dda8d7a7ff9 /src/common/file_util.cpp | |
| parent | e3b25399868cd074e6b61dda73484f5b969fc3be (diff) | |
common/file_util: Make ReadFileToString and WriteStringToFile consistent
Makes the parameter ordering consistent, and also makes the filename
parameter a std::string. A std::string would be constructed anyways with
the previous code, as IOFile's only constructor with a filepath is one
taking a std::string.
We can also make WriteStringToFile's string parameter utilize a
std::string_view for the string, making use of our previous changes to
IOFile.
Diffstat (limited to 'src/common/file_util.cpp')
| -rw-r--r-- | src/common/file_util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index aecb66c32d..8a902dd685 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -762,11 +762,11 @@ std::string GetNANDRegistrationDir(bool system) { return GetUserPath(UserPath::NANDDir) + "user/Contents/registered/"; } -std::size_t WriteStringToFile(bool text_file, const std::string& str, const char* filename) { - return FileUtil::IOFile(filename, text_file ? "w" : "wb").WriteBytes(str.data(), str.size()); +std::size_t WriteStringToFile(bool text_file, const std::string& filename, std::string_view str) { + return IOFile(filename, text_file ? "w" : "wb").WriteString(str); } -std::size_t ReadFileToString(bool text_file, const char* filename, std::string& str) { +std::size_t ReadFileToString(bool text_file, const std::string& filename, std::string& str) { IOFile file(filename, text_file ? "r" : "rb"); if (!file.IsOpen()) |