From 0ba7fe4ab11d5c7a934a1b45b374f3277bc9f2cf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 21 Jul 2018 22:36:19 -0400 Subject: file_util: Use a u64 to represent number of entries This avoids a truncating cast on size. I doubt we'd ever traverse a directory this large, however we also shouldn't truncate sizes away. --- src/core/file_sys/vfs_real.cpp | 6 +++--- src/core/loader/deconstructed_rom_directory.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core') 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(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)) { -- cgit v1.2.3