summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-19 07:38:45 -0700
committerGitHub <noreply@github.com>2018-07-19 07:38:45 -0700
commit758c357868fca86edf3642a5a7e658839d35183c (patch)
tree75c83c64cda67e46cd361beac9d778f890d743a0 /src/core
parent87053fb3b84e50bc0e28b7518da80a21a01b29aa (diff)
parent5e626c774fa28cf8689f4f3e52d2c4c5ba8c64ed (diff)
Merge pull request #699 from lioncash/vfs
vfs: Deduplicate accumulation code in VfsDirectory's GetSize()
Diffstat (limited to 'src/core')
-rw-r--r--src/core/file_sys/vfs.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/file_sys/vfs.cpp b/src/core/file_sys/vfs.cpp
index f859ef33f..16c8ad90b 100644
--- a/src/core/file_sys/vfs.cpp
+++ b/src/core/file_sys/vfs.cpp
@@ -116,14 +116,14 @@ bool VfsDirectory::IsRoot() const {
size_t VfsDirectory::GetSize() const {
const auto& files = GetFiles();
- const auto file_total =
- std::accumulate(files.begin(), files.end(), 0ull,
- [](const auto& f1, const auto& f2) { return f1 + f2->GetSize(); });
+ const auto sum_sizes = [](const auto& range) {
+ return std::accumulate(range.begin(), range.end(), 0ULL,
+ [](const auto& f1, const auto& f2) { return f1 + f2->GetSize(); });
+ };
+ const auto file_total = sum_sizes(files);
const auto& sub_dir = GetSubdirectories();
- const auto subdir_total =
- std::accumulate(sub_dir.begin(), sub_dir.end(), 0ull,
- [](const auto& f1, const auto& f2) { return f1 + f2->GetSize(); });
+ const auto subdir_total = sum_sizes(sub_dir);
return file_total + subdir_total;
}