use accumulate

Author: ludviggunne

cli/processexecutor.cpp

@@ -234,12 +234,11 @@ unsigned int ProcessExecutor::check()
     unsigned int fileCount = 0;
     unsigned int result = 0;
 
-    std::size_t totalfilesize = std::accumulate(mFileSettings.cbegin(), mFileSettings.cend(), std::size_t(0), [](std::size_t v, const FileSettings& fs) {
+    std::size_t totalfilesize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& fwd) {
+        return v + fwd.size();
+    }) + std::accumulate(mFileSettings.cbegin(), mFileSettings.cend(), std::size_t(0), [](std::size_t v, const FileSettings& fs) {
         return v + fs.filesize();
     });
-    for (const auto &f : mFiles) {
-        totalfilesize += f.size();
-    }
 
     std::list<int> rpipes;
     std::map<pid_t, std::string> childFile;

cli/threadexecutor.cpp

@@ -91,10 +91,9 @@ class ThreadData
         mTotalFiles = mFiles.size() + mFileSettings.size();
         mTotalFileSize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& p) {
             return v + p.size();
+        }) + std::accumulate(mFileSettings.cbegin(), mFileSettings.cend(), std::size_t(0), [](std::size_t v, const FileSettings& p) {
+            return v + p.filesize();
         });
-        for (const auto &fs : mFileSettings) {
-            mTotalFileSize += fs.filesize();
-        }
     }
 
     bool next(const FileWithDetails *&file, const FileSettings *&fs, std::size_t &fileSize) {