N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

File_util: Fix parameter shadowing

Browse source
This commit is contained in:
Paul "Dettorer" Hervot 2015-11-29 08:46:56 +01:00 committed by Paul Dettorer Hervot
parent bae02f20b4
commit 7987b5c66b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/file_util.cpp
View file

@ -475,11 +475,11 @@ bool ForeachDirectoryEntry(unsigned* num_entries_out, const std::string &directo
unsigned ScanDirectoryTree(const std::string &directory, FSTEntry& parent_entry) unsigned ScanDirectoryTree(const std::string &directory, FSTEntry& parent_entry)
{ {
const auto callback = [&parent_entry](unsigned* num_entries_out, const auto callback = [&parent_entry](unsigned* num_entries_out,
const std::string& directory, const std::string& _directory,
const std::string& virtual_name) -> bool { const std::string& virtual_name) -> bool {
FSTEntry entry; FSTEntry entry;
entry.virtualName = virtual_name; entry.virtualName = virtual_name;
entry.physicalName = directory + DIR_SEP + virtual_name; entry.physicalName = _directory + DIR_SEP + virtual_name;
if (IsDirectory(entry.physicalName)) { if (IsDirectory(entry.physicalName)) {
entry.isDirectory = true; entry.isDirectory = true;
@ -505,9 +505,9 @@ unsigned ScanDirectoryTree(const std::string &directory, FSTEntry& parent_entry)
bool DeleteDirRecursively(const std::string &directory) bool DeleteDirRecursively(const std::string &directory)
{ {
const static auto callback = [](unsigned* num_entries_out, const static auto callback = [](unsigned* num_entries_out,
const std::string& directory, const std::string& _directory,
const std::string& virtual_name) -> bool { const std::string& virtual_name) -> bool {
std::string new_path = directory + DIR_SEP_CHR + virtual_name; std::string new_path = _directory + DIR_SEP_CHR + virtual_name;
if (IsDirectory(new_path)) if (IsDirectory(new_path))
return DeleteDirRecursively(new_path); return DeleteDirRecursively(new_path);