Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: Resolve misc cases of variable shadowing

Browse source 
Resolves shadowing warnings that aren't in a particularly large
subsection of core. Brings us closer to turning -Wshadow into an error.

All that remains now is for cases in the kernel (left untouched for now
since a big change by bunnei is pending), and a few left over in the
service code (will be tackled next).
This commit is contained in:
Lioncash 2021-05-02 22:14:15 -04:00
parent c17a59b58e
commit ebb64d5bf4
10 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/loader/deconstructed_rom_directory.cpp
View file

@ -79,8 +79,8 @@ AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(
: AppLoader(directory->GetFile("main")), dir(std::move(directory)),
override_update(override_update) {}
FileType AppLoader_DeconstructedRomDirectory::IdentifyType(const FileSys::VirtualFile& file) {
if (FileSys::IsDirectoryExeFS(file->GetContainingDirectory())) {
FileType AppLoader_DeconstructedRomDirectory::IdentifyType(const FileSys::VirtualFile& dir_file) {
if (FileSys::IsDirectoryExeFS(dir_file->GetContainingDirectory())) {
return FileType::DeconstructedRomDirectory;
}

11
src/core/loader/deconstructed_rom_directory.h
View file

@ -31,11 +31,14 @@ public:
bool override_update = false);
/**
* Returns the type of the file
* @param file open file
* @return FileType found, or FileType::Error if this loader doesn't know it
* Identifies whether or not the given file is a deconstructed ROM directory.
*
* @param dir_file The file to verify.
*
* @return FileType::DeconstructedRomDirectory, or FileType::Error
* if the file is not a deconstructed ROM directory.
*/
static FileType IdentifyType(const FileSys::VirtualFile& file);
static FileType IdentifyType(const FileSys::VirtualFile& dir_file);
FileType GetFileType() const override {
return IdentifyType(file);