franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #699 from lioncash/vfs 

vfs: Deduplicate accumulation code in VfsDirectory's GetSize()
This commit is contained in:
bunnei 2018-07-19 07:38:45 -07:00 committed by GitHub
parent 87053fb3b8 5e626c774f
commit 758c357868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/file_sys/vfs.cpp
View File

@ -116,14 +116,14 @@ bool VfsDirectory::IsRoot() const {
size_t VfsDirectory::GetSize() const { size_t VfsDirectory::GetSize() const {
const auto& files = GetFiles(); const auto& files = GetFiles();
const auto file_total = const auto sum_sizes = [](const auto& range) {
std::accumulate(files.begin(), files.end(), 0ull, return std::accumulate(range.begin(), range.end(), 0ULL,
[](const auto& f1, const auto& f2) { return f1 + f2->GetSize(); }); [](const auto& f1, const auto& f2) { return f1 + f2->GetSize(); });
};
const auto file_total = sum_sizes(files);
const auto& sub_dir = GetSubdirectories(); const auto& sub_dir = GetSubdirectories();
const auto subdir_total = const auto subdir_total = sum_sizes(sub_dir);
std::accumulate(sub_dir.begin(), sub_dir.end(), 0ull,
[](const auto& f1, const auto& f2) { return f1 + f2->GetSize(); });
return file_total + subdir_total; return file_total + subdir_total;
} }