Make GeoLookup::debug function static (and non-member), as suggested …

…by cppcheck.
owasp-modsecurity · Oct 21, 2024 · 7ec50eb · 7ec50eb
1 parent 4e68edf
commit 7ec50eb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/src/operators/geo_lookup.cc b/src/operators/geo_lookup.cc
@@ -30,8 +30,13 @@
 #include "src/utils/geo_lookup.h"
 
 
-namespace modsecurity {
-namespace operators {
+namespace modsecurity::operators {
+
+
+static bool debug(const Transaction *transaction, int x, const std::string &a) {
+    ms_dbg_a(transaction, x, a);
+    return true;
+}
 
 
 bool GeoLookup::evaluate(Transaction *trans, const std::string &exp) {
@@ -41,15 +46,14 @@ bool GeoLookup::evaluate(Transaction *trans, const std::string &exp) {
 
     if (trans) {
         ret = Utils::GeoLookup::getInstance().lookup(exp, trans,
-            std::bind(&GeoLookup::debug, this, trans, _1, _2));
+            std::bind(debug, trans, _1, _2));
     } else {
-        ret = Utils::GeoLookup::getInstance().lookup(exp, NULL,
+        ret = Utils::GeoLookup::getInstance().lookup(exp, nullptr,
             nullptr);
     }
 
     return ret;
 }
 
 
-}  // namespace operators
-}  // namespace modsecurity
+}  // namespace modsecurity::operators
diff --git a/src/operators/geo_lookup.h b/src/operators/geo_lookup.h
@@ -21,26 +21,19 @@
 #include "src/operators/operator.h"
 
 
-namespace modsecurity {
-namespace operators {
+namespace modsecurity::operators {
+
 
 class GeoLookup : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     GeoLookup()
         : Operator("GeoLookup") { }
     bool evaluate(Transaction *transaction, const std::string &exp) override;
-
- protected:
-    // cppcheck-suppress functionStatic
-    bool debug(const Transaction *transaction, int x, const std::string &a) {
-        ms_dbg_a(transaction, x, a);
-        return true;
-    }
 };
 
-}  // namespace operators
-}  // namespace modsecurity
+
+}  // namespace modsecurity::operators
 
 
 #endif  // SRC_OPERATORS_GEO_LOOKUP_H_