Преглед изворни кода

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.
Lioncash пре 7 година
родитељ
комит
15e0c4c4ec
1 измењених фајлова са 8 додато и 5 уклоњено
  1. 8 5
      src/core/hle/service/filesystem/filesystem.cpp

+ 8 - 5
src/core/hle/service/filesystem/filesystem.cpp

@@ -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_));
-    auto npath = path;
-    while (npath.size() > 0 && (npath[0] == '/' || npath[0] == '\\'))
-        npath = npath.substr(1);
+    const std::string path(FileUtil::SanitizePath(path_));
+    std::string_view npath = path;
+    while (!npath.empty() && (npath[0] == '/' || npath[0] == '\\')) {
+        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>(