Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix clang-tidy modernize-use-transparent-functors findings

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-05-16 16:06:13 -07:00
parent 2f0e3a5e23
commit 0681ab9071
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.clang-tidy
View file

@ -13,6 +13,7 @@ Checks: [-*,
modernize-use-emplace,
modernize-use-nullptr,
modernize-use-override,
modernize-use-transparent-functors,
# Enable a very limited number of the cppcoreguidelines checkers.
# See the notes for some of the rest of them below.

24
src/RuleMatcher.cc
View file

@ -549,17 +549,17 @@ static inline bool match_not_and(const vector<IPPrefix>& prefixes, const IPAddr&
static inline bool compare(const maskedvalue_list& mvals, uint32_t v, RuleHdrTest::Comp comp) {
switch ( comp ) {
case RuleHdrTest::EQ: return match_or(mvals, v, std::equal_to<uint32_t>()); break;
case RuleHdrTest::EQ: return match_or(mvals, v, std::equal_to<>()); break;
case RuleHdrTest::NE: return match_not_and(mvals, v, std::equal_to<uint32_t>()); break;
case RuleHdrTest::NE: return match_not_and(mvals, v, std::equal_to<>()); break;
case RuleHdrTest::LT: return match_or(mvals, v, std::less<uint32_t>()); break;
case RuleHdrTest::LT: return match_or(mvals, v, std::less<>()); break;
case RuleHdrTest::GT: return match_or(mvals, v, std::greater<uint32_t>()); break;
case RuleHdrTest::GT: return match_or(mvals, v, std::greater<>()); break;
case RuleHdrTest::LE: return match_or(mvals, v, std::less_equal<uint32_t>()); break;
case RuleHdrTest::LE: return match_or(mvals, v, std::less_equal<>()); break;
case RuleHdrTest::GE: return match_or(mvals, v, std::greater_equal<uint32_t>()); break;
case RuleHdrTest::GE: return match_or(mvals, v, std::greater_equal<>()); break;
default: reporter->InternalError("unknown RuleHdrTest comparison type"); break;
}
@ -568,17 +568,17 @@ static inline bool compare(const maskedvalue_list& mvals, uint32_t v, RuleHdrTes
static inline bool compare(const vector<IPPrefix>& prefixes, const IPAddr& a, RuleHdrTest::Comp comp) {
switch ( comp ) {
case RuleHdrTest::EQ: return match_or(prefixes, a, std::equal_to<IPAddr>()); break;
case RuleHdrTest::EQ: return match_or(prefixes, a, std::equal_to<>()); break;
case RuleHdrTest::NE: return match_not_and(prefixes, a, std::equal_to<IPAddr>()); break;
case RuleHdrTest::NE: return match_not_and(prefixes, a, std::equal_to<>()); break;
case RuleHdrTest::LT: return match_or(prefixes, a, std::less<IPAddr>()); break;
case RuleHdrTest::LT: return match_or(prefixes, a, std::less<>()); break;
case RuleHdrTest::GT: return match_or(prefixes, a, std::greater<IPAddr>()); break;
case RuleHdrTest::GT: return match_or(prefixes, a, std::greater<>()); break;
case RuleHdrTest::LE: return match_or(prefixes, a, std::less_equal<IPAddr>()); break;
case RuleHdrTest::LE: return match_or(prefixes, a, std::less_equal<>()); break;
case RuleHdrTest::GE: return match_or(prefixes, a, std::greater_equal<IPAddr>()); break;
case RuleHdrTest::GE: return match_or(prefixes, a, std::greater_equal<>()); break;
default: reporter->InternalError("unknown RuleHdrTest comparison type"); break;
}