Skip to content

Commit d03a293

Browse files
zimmerleWGH-
authored andcommitted
Removes unecessary static methods from regex class
1 parent bf98382 commit d03a293

File tree

13 files changed

+15
-31
lines changed

13 files changed

+15
-31
lines changed

src/anchored_set_variable.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ std::unique_ptr<std::string> AnchoredSetVariable::resolveFirst(
126126
void AnchoredSetVariable::resolveRegularExpression(regex::Regex *r,
127127
std::vector<const VariableValue *> *l) {
128128
for (const auto& x : *this) {
129-
int ret = regex::regex_search(x.first, *r);
129+
int ret = r->search(x.first);
130130
if (ret <= 0) {
131131
continue;
132132
}
@@ -139,7 +139,7 @@ void AnchoredSetVariable::resolveRegularExpression(regex::Regex *r,
139139
std::vector<const VariableValue *> *l,
140140
variables::KeyExclusions &ke) {
141141
for (const auto& x : *this) {
142-
int ret = regex::regex_search(x.first, *r);
142+
int ret = r->search(x.first);
143143
if (ret <= 0) {
144144
continue;
145145
}

src/audit_log/audit_log.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,7 @@ bool AuditLog::isRelevant(int status) {
278278
return true;
279279
}
280280

281-
return regex::regex_search(sstatus,
282-
regex::Regex(m_relevant)) != 0;
281+
return regex::Regex(m_relevant).search(sstatus) != 0;
283282
}
284283

285284

src/collection/backend/in_memory-per_process.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void InMemoryPerProcess::resolveRegularExpression(const std::string& var,
148148
//}
149149
//std::string content = std::string(x.first, keySize + 1,
150150
// x.first.size() - keySize - 1);
151-
int ret = regex::regex_search(x.first, r);
151+
int ret = r.search(x.first);
152152
if (ret <= 0) {
153153
continue;
154154
}

src/collection/backend/lmdb.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ void LMDB::resolveRegularExpression(const std::string& var,
559559

560560
while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
561561
char *a = reinterpret_cast<char *>(key.mv_data);
562-
int ret = regex::regex_search(a, r);
562+
int ret = r.search(a);
563563
if (ret <= 0) {
564564
continue;
565565
}

src/operators/rx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
namespace modsecurity {
2929
using regex::RegexMatch;
30-
using regex::regex_search;
3130
using regex::Regex;
3231

3332
namespace operators {

src/operators/verify_cpf.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
namespace modsecurity {
2828
using regex::RegexMatch;
29-
using regex::regex_search;
3029
using regex::Regex;
3130

3231
namespace operators {

src/operators/verify_ssn.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
namespace modsecurity {
2828
using regex::RegexMatch;
29-
using regex::regex_search;
3029
using regex::Regex;
3130

3231
namespace operators {

src/operators/verify_svnr.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
namespace modsecurity {
1414
using regex::RegexMatch;
15-
using regex::regex_search;
1615
using regex::Regex;
1716

1817
namespace operators {

src/regex/regex.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,6 @@ class Regex {
8181
};
8282

8383

84-
static inline int regex_search(const std::string& s, RegexMatch *match, const Regex& regex) {
85-
return regex.search(s, match);
86-
}
87-
88-
89-
static inline int regex_search(const std::string& s, const Regex& regex) {
90-
return regex.search(s);
91-
}
92-
93-
9484
} // namespace regex
9585
} // namespace modsecurity
9686

src/variables/rule.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,23 @@ class Rule_DictElementRegexp : public VariableRegex {
200200
void evaluate(Transaction *t,
201201
RuleWithActions *rule,
202202
std::vector<const VariableValue *> *l) override {
203-
if (regex::regex_search("id", m_r) > 0) {
203+
if (m_r.search("id") > 0) {
204204
Rule_DictElement::id(t, rule, l);
205205
return;
206206
}
207-
if (regex::regex_search("rev", m_r) > 0) {
207+
if (m_r.search("rev") > 0) {
208208
Rule_DictElement::rev(t, rule, l);
209209
return;
210210
}
211-
if (regex::regex_search("severity", m_r) > 0) {
211+
if (m_r.search("severity") > 0) {
212212
Rule_DictElement::severity(t, rule, l);
213213
return;
214214
}
215-
if (regex::regex_search("logdata", m_r) > 0) {
215+
if (m_r.search("logdata") > 0) {
216216
Rule_DictElement::logData(t, rule, l);
217217
return;
218218
}
219-
if (regex::regex_search("msg", m_r) > 0) {
219+
if (m_r.search("msg") > 0) {
220220
Rule_DictElement::msg(t, rule, l);
221221
return;
222222
}

0 commit comments

Comments
 (0)