last batch

diff --git a/examples/patbench.cc b/examples/patbench.cc
index 1f965f131d0fb5efb0ed06de0716810b33d6a83e..132e416fa2c610de201998a06ad86dcd741357c4 100644 (file)
--- a/examples/patbench.cc
+++ b/examples/patbench.cc
@@ -358,9 +358,11 @@ public:
     // Return the number of bytes scanned
     size_t bytes() const {
         size_t sum = 0;
-        for (const auto &packet : packets) {
-            sum += packet.size();
-        }
+        auto packs = [](size_t z, const string &packet) { return z + packet.size(); };
+        sum += std::accumulate(packets.begin(), packets.end(), 0, packs);
+        // for (const auto &packet : packets) {
+        //     sum += packet.size();
+        // }
         return sum;
     }
 
@@ -461,6 +463,7 @@ public:
         vector<const char *> cstrPatterns;
         cstrPatterns.reserve(patterns.size());
         for (const auto &pattern : patterns) {
+            // cppcheck-suppress useStlAlgorithm
             cstrPatterns.push_back(pattern.c_str());
         }
 

diff --git a/examples/pcapscan.cc b/examples/pcapscan.cc
index bd5493a40707da62971ecfc4bcf380f58c106774..071de7407af896b81e9d098d48dc956990d02980 100644 (file)
--- a/examples/pcapscan.cc
+++ b/examples/pcapscan.cc
@@ -55,6 +55,7 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
+#include <numeric>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -250,9 +251,8 @@ public:
     // Return the number of bytes scanned
     size_t bytes() const {
         size_t sum = 0;
-        for (const auto &packet : packets) {
-            sum += packet.size();
-        }
+        auto packs = [](size_t z, const string &packet) { return z + packet.size(); };
+        sum += std::accumulate(packets.begin(), packets.end(), 0, packs);
         return sum;
     }
 
@@ -433,6 +433,7 @@ static void databasesFromFile(const char *filename,
     // storage.)
     vector<const char*> cstrPatterns;
     for (const auto &pattern : patterns) {
+        // cppcheck-suppress useStlAlgorithm
         cstrPatterns.push_back(pattern.c_str());
     }