github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make GeoLookup::debug function static (and non-member), as suggested by cppcheck.

Browse Source
This commit is contained in:
Eduardo Arias 2024-10-21 16:02:27 -03:00
parent 4e68edf0e5
commit 7ec50eb53f
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/operators/geo_lookup.cc
View File

@ -30,8 +30,13 @@
#include "src/utils/geo_lookup.h" #include "src/utils/geo_lookup.h"
namespace modsecurity { namespace modsecurity::operators {
namespace 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) { bool GeoLookup::evaluate(Transaction *trans, const std::string &exp) {
@ -41,9 +46,9 @@ bool GeoLookup::evaluate(Transaction *trans, const std::string &exp) {
if (trans) { if (trans) {
ret = Utils::GeoLookup::getInstance().lookup(exp, trans, ret = Utils::GeoLookup::getInstance().lookup(exp, trans,
std::bind(&GeoLookup::debug, this, trans, _1, _2)); std::bind(debug, trans, _1, _2));
} else { } else {
ret = Utils::GeoLookup::getInstance().lookup(exp, NULL, ret = Utils::GeoLookup::getInstance().lookup(exp, nullptr,
nullptr); nullptr);
} }
@ -51,5 +56,4 @@ bool GeoLookup::evaluate(Transaction *trans, const std::string &exp) {
} }
} // namespace operators } // namespace modsecurity::operators
} // namespace modsecurity

15
src/operators/geo_lookup.h
View File

@ -21,8 +21,8 @@
#include "src/operators/operator.h" #include "src/operators/operator.h"
namespace modsecurity { namespace modsecurity::operators {
namespace operators {
class GeoLookup : public Operator { class GeoLookup : public Operator {
public: public:
@ -30,17 +30,10 @@ class GeoLookup : public Operator {
GeoLookup() GeoLookup()
: Operator("GeoLookup") { } : Operator("GeoLookup") { }
bool evaluate(Transaction *transaction, const std::string &exp) override; 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_ #endif // SRC_OPERATORS_GEO_LOOKUP_H_