Fix cppcheck warnings in anchored variables

Author: airween

headers/modsecurity/anchored_set_variable.h

@@ -84,13 +84,26 @@ class AnchoredSetVariable : public std::unordered_multimap<std::string,
 
     void setCopy(std::string key, std::string value, size_t offset);
 
+    void resolve(std::vector<const VariableValue *> *l) const;
+    void resolve(std::vector<const VariableValue *> *l,
+        const variables::KeyExclusions &ke) const;
+
+    // keep the old signatures for ABI compatibility
     void resolve(std::vector<const VariableValue *> *l);
     void resolve(std::vector<const VariableValue *> *l,
         variables::KeyExclusions &ke);
 
     void resolve(const std::string &key,
         std::vector<const VariableValue *> *l);
 
+    void resolveRegularExpression(Utils::Regex *r,
+        std::vector<const VariableValue *> *l) const;
+
+    void resolveRegularExpression(Utils::Regex *r,
+        std::vector<const VariableValue *> *l,
+        const variables::KeyExclusions &ke) const;
+
+    // keep the old signatures for ABI compatibility
     void resolveRegularExpression(Utils::Regex *r,
         std::vector<const VariableValue *> *l);
 

src/anchored_set_variable.cc

@@ -67,16 +67,22 @@ void AnchoredSetVariable::set(const std::string &key,
 
 
 void AnchoredSetVariable::resolve(
-    std::vector<const VariableValue *> *l) {
+    std::vector<const VariableValue *> *l) const {
     for (const auto& x : *this) {
         l->insert(l->begin(), new VariableValue(x.second));
     }
 }
 
 
+void AnchoredSetVariable::resolve(
+    std::vector<const VariableValue *> *l) {
+    static_cast<const AnchoredSetVariable&>(*this).resolve(l);
+}
+
+
 void AnchoredSetVariable::resolve(
     std::vector<const VariableValue *> *l,
-    variables::KeyExclusions &ke) {
+    const variables::KeyExclusions &ke) const {
     for (const auto& x : *this) {
         if (!ke.toOmit(x.first)) {
             l->insert(l->begin(), new VariableValue(x.second));
@@ -88,6 +94,13 @@ void AnchoredSetVariable::resolve(
 }
 
 
+void AnchoredSetVariable::resolve(
+    std::vector<const VariableValue *> *l,
+    variables::KeyExclusions &ke) {  // cppcheck-suppress constParameterReference
+    static_cast<const AnchoredSetVariable&>(*this).resolve(l, ke);
+}
+
+
 void AnchoredSetVariable::resolve(const std::string &key,
     std::vector<const VariableValue *> *l) {
     auto range = this->equal_range(key);
@@ -109,7 +122,7 @@ std::unique_ptr<std::string> AnchoredSetVariable::resolveFirst(
 
 
 void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
-    std::vector<const VariableValue *> *l) {
+    std::vector<const VariableValue *> *l) const {
     for (const auto& x : *this) {
         int ret = Utils::regex_search(x.first, *r);
         if (ret <= 0) {
@@ -120,9 +133,15 @@ void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
 }
 
 
+void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
+    std::vector<const VariableValue *> *l) {
+    static_cast<const AnchoredSetVariable&>(*this).resolveRegularExpression(r, l);
+}
+
+
 void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
     std::vector<const VariableValue *> *l,
-    variables::KeyExclusions &ke) {
+    const variables::KeyExclusions &ke) const {
     for (const auto& x : *this) {
         int ret = Utils::regex_search(x.first, *r);
         if (ret <= 0) {
@@ -138,4 +157,11 @@ void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
 }
 
 
+void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
+    std::vector<const VariableValue *> *l,
+    variables::KeyExclusions &ke) {  // cppcheck-suppress constParameterReference
+    static_cast<const AnchoredSetVariable&>(*this).resolveRegularExpression(r, l);
+}
+
+
 }  // namespace modsecurity

src/variables/variable.h

@@ -163,7 +163,7 @@ class KeyExclusions : public std::deque<std::unique_ptr<KeyExclusion>> {
         return false;
     }
 
-    bool toOmit(std::string a) {
+    bool toOmit(std::string a) { // cppcheck-suppress passedByValue
         return static_cast<const KeyExclusions&>(*this).toOmit(a);
     }
 };