diff options
author | bunnei <bunneidev@gmail.com> | 2021-05-03 00:12:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-03 00:12:07 +0200 |
commit | c17a59b58e4c78dfee976dabddd13c3c6fdf95b7 (patch) | |
tree | 7a935c140bd467ca9e5e3ca27547ee6fee14861f /src/core/file_sys/vfs_real.cpp | |
parent | Merge pull request #6263 from Kewlan/folder-swap-expand-state (diff) | |
parent | file_sys: Resolve cases of variable shadowing (diff) | |
download | yuzu-c17a59b58e4c78dfee976dabddd13c3c6fdf95b7.tar yuzu-c17a59b58e4c78dfee976dabddd13c3c6fdf95b7.tar.gz yuzu-c17a59b58e4c78dfee976dabddd13c3c6fdf95b7.tar.bz2 yuzu-c17a59b58e4c78dfee976dabddd13c3c6fdf95b7.tar.lz yuzu-c17a59b58e4c78dfee976dabddd13c3c6fdf95b7.tar.xz yuzu-c17a59b58e4c78dfee976dabddd13c3c6fdf95b7.tar.zst yuzu-c17a59b58e4c78dfee976dabddd13c3c6fdf95b7.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/vfs_real.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/file_sys/vfs_real.cpp b/src/core/file_sys/vfs_real.cpp index a44ce6288..3d89dd644 100644 --- a/src/core/file_sys/vfs_real.cpp +++ b/src/core/file_sys/vfs_real.cpp @@ -358,16 +358,16 @@ RealVfsDirectory::RealVfsDirectory(RealVfsFilesystem& base_, const std::string& RealVfsDirectory::~RealVfsDirectory() = default; -VirtualFile RealVfsDirectory::GetFileRelative(std::string_view path) const { - const auto full_path = FS::SanitizePath(this->path + DIR_SEP + std::string(path)); +VirtualFile RealVfsDirectory::GetFileRelative(std::string_view relative_path) const { + const auto full_path = FS::SanitizePath(path + DIR_SEP + std::string(relative_path)); if (!FS::Exists(full_path) || FS::IsDirectory(full_path)) { return nullptr; } return base.OpenFile(full_path, perms); } -VirtualDir RealVfsDirectory::GetDirectoryRelative(std::string_view path) const { - const auto full_path = FS::SanitizePath(this->path + DIR_SEP + std::string(path)); +VirtualDir RealVfsDirectory::GetDirectoryRelative(std::string_view relative_path) const { + const auto full_path = FS::SanitizePath(path + DIR_SEP + std::string(relative_path)); if (!FS::Exists(full_path) || !FS::IsDirectory(full_path)) { return nullptr; } @@ -382,13 +382,13 @@ VirtualDir RealVfsDirectory::GetSubdirectory(std::string_view name) const { return GetDirectoryRelative(name); } -VirtualFile RealVfsDirectory::CreateFileRelative(std::string_view path) { - const auto full_path = FS::SanitizePath(this->path + DIR_SEP + std::string(path)); +VirtualFile RealVfsDirectory::CreateFileRelative(std::string_view relative_path) { + const auto full_path = FS::SanitizePath(path + DIR_SEP + std::string(relative_path)); return base.CreateFile(full_path, perms); } -VirtualDir RealVfsDirectory::CreateDirectoryRelative(std::string_view path) { - const auto full_path = FS::SanitizePath(this->path + DIR_SEP + std::string(path)); +VirtualDir RealVfsDirectory::CreateDirectoryRelative(std::string_view relative_path) { + const auto full_path = FS::SanitizePath(path + DIR_SEP + std::string(relative_path)); return base.CreateDirectory(full_path, perms); } |