From 1da72c7792e4f68fd44579a713288f6772c193b4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 2 May 2021 02:34:40 -0400 Subject: file_sys: Resolve cases of variable shadowing Brings us closer to enabling -Wshadow as an error in the core code. --- src/core/file_sys/vfs_real.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/core/file_sys/vfs_real.cpp') 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); } -- cgit v1.2.3