diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/file_util.cpp | 20 | ||||
| -rw-r--r-- | src/common/file_util.h | 8 | ||||
| -rw-r--r-- | src/core/file_sys/vfs_real.cpp | 6 | ||||
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/game_list.cpp | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index d8163a4a8..47ac8368e 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -396,12 +396,12 @@ bool CreateEmptyFile(const std::string& filename) { return true; } -bool ForeachDirectoryEntry(unsigned* num_entries_out, const std::string& directory, +bool ForeachDirectoryEntry(u64* num_entries_out, const std::string& directory, DirectoryEntryCallable callback) { LOG_TRACE(Common_Filesystem, "directory {}", directory); // How many files + directories we found - unsigned found_entries = 0; + u64 found_entries = 0; // Save the status of callback function bool callback_error = false; @@ -431,7 +431,7 @@ bool ForeachDirectoryEntry(unsigned* num_entries_out, const std::string& directo if (virtual_name == "." || virtual_name == "..") continue; - unsigned ret_entries = 0; + u64 ret_entries = 0; if (!callback(&ret_entries, directory, virtual_name)) { callback_error = true; break; @@ -455,9 +455,9 @@ bool ForeachDirectoryEntry(unsigned* num_entries_out, const std::string& directo return true; } -unsigned ScanDirectoryTree(const std::string& directory, FSTEntry& parent_entry, - unsigned int recursion) { - const auto callback = [recursion, &parent_entry](unsigned* num_entries_out, +u64 ScanDirectoryTree(const std::string& directory, FSTEntry& parent_entry, + unsigned int recursion) { + const auto callback = [recursion, &parent_entry](u64* num_entries_out, const std::string& directory, const std::string& virtual_name) -> bool { FSTEntry entry; @@ -469,7 +469,7 @@ unsigned ScanDirectoryTree(const std::string& directory, FSTEntry& parent_entry, // is a directory, lets go inside if we didn't recurse to often if (recursion > 0) { entry.size = ScanDirectoryTree(entry.physicalName, entry, recursion - 1); - *num_entries_out += (int)entry.size; + *num_entries_out += entry.size; } else { entry.size = 0; } @@ -480,16 +480,16 @@ unsigned ScanDirectoryTree(const std::string& directory, FSTEntry& parent_entry, (*num_entries_out)++; // Push into the tree - parent_entry.children.push_back(entry); + parent_entry.children.push_back(std::move(entry)); return true; }; - unsigned num_entries; + u64 num_entries; return ForeachDirectoryEntry(&num_entries, directory, callback) ? num_entries : 0; } bool DeleteDirRecursively(const std::string& directory, unsigned int recursion) { - const auto callback = [recursion](unsigned* num_entries_out, const std::string& directory, + const auto callback = [recursion](u64* num_entries_out, const std::string& directory, const std::string& virtual_name) -> bool { std::string new_path = directory + DIR_SEP_CHR + virtual_name; diff --git a/src/common/file_util.h b/src/common/file_util.h index ff01bf0ff..090907c03 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -84,7 +84,7 @@ bool CreateEmptyFile(const std::string& filename); * @return whether handling the entry succeeded */ using DirectoryEntryCallable = std::function<bool( - unsigned* num_entries_out, const std::string& directory, const std::string& virtual_name)>; + u64* num_entries_out, const std::string& directory, const std::string& virtual_name)>; /** * Scans a directory, calling the callback for each file/directory contained within. @@ -95,7 +95,7 @@ using DirectoryEntryCallable = std::function<bool( * @param callback The callback which will be called for each entry * @return whether scanning the directory succeeded */ -bool ForeachDirectoryEntry(unsigned* num_entries_out, const std::string& directory, +bool ForeachDirectoryEntry(u64* num_entries_out, const std::string& directory, DirectoryEntryCallable callback); /** @@ -105,8 +105,8 @@ bool ForeachDirectoryEntry(unsigned* num_entries_out, const std::string& directo * @param recursion Number of children directories to read before giving up. * @return the total number of files/directories found */ -unsigned ScanDirectoryTree(const std::string& directory, FSTEntry& parent_entry, - unsigned int recursion = 0); +u64 ScanDirectoryTree(const std::string& directory, FSTEntry& parent_entry, + unsigned int recursion = 0); // deletes the given directory and anything under it. Returns true on success. bool DeleteDirRecursively(const std::string& directory, unsigned int recursion = 256); diff --git a/src/core/file_sys/vfs_real.cpp b/src/core/file_sys/vfs_real.cpp index f27fb1f2a..27fd464ae 100644 --- a/src/core/file_sys/vfs_real.cpp +++ b/src/core/file_sys/vfs_real.cpp @@ -92,13 +92,13 @@ RealVfsDirectory::RealVfsDirectory(const std::string& path_, Mode perms_) perms(perms_) { if (!FileUtil::Exists(path) && (perms == Mode::Write || perms == Mode::Append)) FileUtil::CreateDir(path); - unsigned size; + if (perms == Mode::Append) return; FileUtil::ForeachDirectoryEntry( - &size, path, - [this](unsigned* entries_out, const std::string& directory, const std::string& filename) { + nullptr, path, + [this](u64* entries_out, const std::string& directory, const std::string& filename) { std::string full_path = directory + DIR_SEP + filename; if (FileUtil::IsDirectory(full_path)) subdirectories.emplace_back(std::make_shared<RealVfsDirectory>(full_path, perms)); diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 394963a69..18bd62a08 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -20,7 +20,7 @@ namespace Loader { static std::string FindRomFS(const std::string& directory) { std::string filepath_romfs; - const auto callback = [&filepath_romfs](unsigned*, const std::string& directory, + const auto callback = [&filepath_romfs](u64*, const std::string& directory, const std::string& virtual_name) -> bool { const std::string physical_name = directory + virtual_name; if (FileUtil::IsDirectory(physical_name)) { diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index e1ca0e77b..99e6634a1 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -394,7 +394,7 @@ void GameList::RefreshGameDirectory() { } void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion) { - const auto callback = [this, recursion](unsigned* num_entries_out, const std::string& directory, + const auto callback = [this, recursion](u64* num_entries_out, const std::string& directory, const std::string& virtual_name) -> bool { std::string physical_name = directory + DIR_SEP + virtual_name; |