diff options
| author | 2019-05-23 13:52:40 -0400 | |
|---|---|---|
| committer | 2019-05-23 13:52:43 -0400 | |
| commit | 2b1fcc8a14d93c16ce00e1a9888e3f4f839f18f9 (patch) | |
| tree | 129596d2ff096166c68af0f39ebf6dda8d7a7ff9 /src/common/file_util.cpp | |
| parent | common/file_util: Remove unnecessary c_str() calls (diff) | |
| download | yuzu-2b1fcc8a14d93c16ce00e1a9888e3f4f839f18f9.tar.gz yuzu-2b1fcc8a14d93c16ce00e1a9888e3f4f839f18f9.tar.xz yuzu-2b1fcc8a14d93c16ce00e1a9888e3f4f839f18f9.zip | |
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 aecb66c32..8a902dd68 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp | |||
| @@ -762,11 +762,11 @@ std::string GetNANDRegistrationDir(bool system) { | |||
| 762 | return GetUserPath(UserPath::NANDDir) + "user/Contents/registered/"; | 762 | return GetUserPath(UserPath::NANDDir) + "user/Contents/registered/"; |
| 763 | } | 763 | } |
| 764 | 764 | ||
| 765 | std::size_t WriteStringToFile(bool text_file, const std::string& str, const char* filename) { | 765 | std::size_t WriteStringToFile(bool text_file, const std::string& filename, std::string_view str) { |
| 766 | return FileUtil::IOFile(filename, text_file ? "w" : "wb").WriteBytes(str.data(), str.size()); | 766 | return IOFile(filename, text_file ? "w" : "wb").WriteString(str); |
| 767 | } | 767 | } |
| 768 | 768 | ||
| 769 | std::size_t ReadFileToString(bool text_file, const char* filename, std::string& str) { | 769 | std::size_t ReadFileToString(bool text_file, const std::string& filename, std::string& str) { |
| 770 | IOFile file(filename, text_file ? "r" : "rb"); | 770 | IOFile file(filename, text_file ? "r" : "rb"); |
| 771 | 771 | ||
| 772 | if (!file.IsOpen()) | 772 | if (!file.IsOpen()) |