octo/yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filesystem: Use a std::string_view in OpenFile()

Browse Source 
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.
This commit is contained in:
Lioncash
2019-04-04 20:48:13 -04:00
parent 7c31661869
commit 15e0c4c4ec
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/hle/service/filesystem/filesystem.cpp
View File

@@ -197,13 +197,16 @@ ResultCode VfsDirectoryServiceWrapper::RenameDirectory(const std::string& src_pa
ResultVal<FileSys::VirtualFile> VfsDirectoryServiceWrapper::OpenFile(const std::string& path_, ResultVal<FileSys::VirtualFile> VfsDirectoryServiceWrapper::OpenFile(const std::string& path_,
FileSys::Mode mode) const { FileSys::Mode mode) const {
std::string path(FileUtil::SanitizePath(path_)); const std::string path(FileUtil::SanitizePath(path_));
auto npath = path; std::string_view npath = path;
while (npath.size() > 0 && (npath[0] == '/' || npath[0] == '\\')) while (!npath.empty() && (npath[0] == '/' || npath[0] == '\\')) {
npath = npath.substr(1); npath.remove_prefix(1);
}
auto file = backing->GetFileRelative(npath); auto file = backing->GetFileRelative(npath);
if (file == nullptr) if (file == nullptr) {
return FileSys::ERROR_PATH_NOT_FOUND; return FileSys::ERROR_PATH_NOT_FOUND;
}
if (mode == FileSys::Mode::Append) { if (mode == FileSys::Mode::Append) {
return MakeResult<FileSys::VirtualFile>( return MakeResult<FileSys::VirtualFile>(