diff options
| author | 2019-04-04 20:48:13 -0400 | |
|---|---|---|
| committer | 2019-04-04 20:59:00 -0400 | |
| commit | 15e0c4c4ec112b9f37591ff5791ccca497bb85a0 (patch) | |
| tree | 2ced60ae7f8cde1c4d0380e63f4025f90e66f5db /src | |
| parent | Merge pull request #2330 from lioncash/pragma (diff) | |
| download | yuzu-15e0c4c4ec112b9f37591ff5791ccca497bb85a0.tar.gz yuzu-15e0c4c4ec112b9f37591ff5791ccca497bb85a0.tar.xz yuzu-15e0c4c4ec112b9f37591ff5791ccca497bb85a0.zip | |
filesystem: Use a std::string_view in OpenFile()
Rather than make a full copy of the path, we can just use a string view
and truncate the viewed portion of the string instead of creating a totally
new truncated string.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index c6da2df43..1fbab2789 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp | |||
| @@ -197,13 +197,16 @@ ResultCode VfsDirectoryServiceWrapper::RenameDirectory(const std::string& src_pa | |||
| 197 | 197 | ||
| 198 | ResultVal<FileSys::VirtualFile> VfsDirectoryServiceWrapper::OpenFile(const std::string& path_, | 198 | ResultVal<FileSys::VirtualFile> VfsDirectoryServiceWrapper::OpenFile(const std::string& path_, |
| 199 | FileSys::Mode mode) const { | 199 | FileSys::Mode mode) const { |
| 200 | std::string path(FileUtil::SanitizePath(path_)); | 200 | const std::string path(FileUtil::SanitizePath(path_)); |
| 201 | auto npath = path; | 201 | std::string_view npath = path; |
| 202 | while (npath.size() > 0 && (npath[0] == '/' || npath[0] == '\\')) | 202 | while (!npath.empty() && (npath[0] == '/' || npath[0] == '\\')) { |
| 203 | npath = npath.substr(1); | 203 | npath.remove_prefix(1); |
| 204 | } | ||
| 205 | |||
| 204 | auto file = backing->GetFileRelative(npath); | 206 | auto file = backing->GetFileRelative(npath); |
| 205 | if (file == nullptr) | 207 | if (file == nullptr) { |
| 206 | return FileSys::ERROR_PATH_NOT_FOUND; | 208 | return FileSys::ERROR_PATH_NOT_FOUND; |
| 209 | } | ||
| 207 | 210 | ||
| 208 | if (mode == FileSys::Mode::Append) { | 211 | if (mode == FileSys::Mode::Append) { |
| 209 | return MakeResult<FileSys::VirtualFile>( | 212 | return MakeResult<FileSys::VirtualFile>( |