Removes unecessary static methods from regex class

zimmerle · WGH- · commit d03a293646cd · 2020-09-05T00:38:44.000+03:00
diff --git a/src/anchored_set_variable.cc b/src/anchored_set_variable.cc
@@ -126,7 +126,7 @@ std::unique_ptr<std::string> AnchoredSetVariable::resolveFirst(
 void AnchoredSetVariable::resolveRegularExpression(regex::Regex *r,
     std::vector<const VariableValue *> *l) {
     for (const auto& x : *this) {
-        int ret = regex::regex_search(x.first, *r);
+        int ret = r->search(x.first);
         if (ret <= 0) {
             continue;
         }
@@ -139,7 +139,7 @@ void AnchoredSetVariable::resolveRegularExpression(regex::Regex *r,
     std::vector<const VariableValue *> *l,
     variables::KeyExclusions &ke) {
     for (const auto& x : *this) {
-        int ret = regex::regex_search(x.first, *r);
+        int ret = r->search(x.first);
         if (ret <= 0) {
             continue;
         }
diff --git a/src/audit_log/audit_log.cc b/src/audit_log/audit_log.cc
@@ -278,8 +278,7 @@ bool AuditLog::isRelevant(int status) {
         return true;
     }
 
-    return regex::regex_search(sstatus,
-        regex::Regex(m_relevant)) != 0;
+    return regex::Regex(m_relevant).search(sstatus) != 0;
 }
 
 
diff --git a/src/collection/backend/in_memory-per_process.cc b/src/collection/backend/in_memory-per_process.cc
@@ -148,7 +148,7 @@ void InMemoryPerProcess::resolveRegularExpression(const std::string& var,
         //}
         //std::string content = std::string(x.first, keySize + 1,
          //                                 x.first.size() - keySize - 1);
-        int ret = regex::regex_search(x.first, r);
+        int ret = r.search(x.first);
         if (ret <= 0) {
             continue;
         }
diff --git a/src/collection/backend/lmdb.cc b/src/collection/backend/lmdb.cc
@@ -559,7 +559,7 @@ void LMDB::resolveRegularExpression(const std::string& var,
 
     while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
         char *a = reinterpret_cast<char *>(key.mv_data);
-        int ret = regex::regex_search(a, r);
+        int ret = r.search(a);
         if (ret <= 0) {
             continue;
         }
diff --git a/src/operators/rx.h b/src/operators/rx.h
@@ -27,7 +27,6 @@
 
 namespace modsecurity {
 using regex::RegexMatch;
-using regex::regex_search;
 using regex::Regex;
 
 namespace operators {
diff --git a/src/operators/verify_cpf.h b/src/operators/verify_cpf.h
@@ -26,7 +26,6 @@
 
 namespace modsecurity {
 using regex::RegexMatch;
-using regex::regex_search;
 using regex::Regex;
 
 namespace operators {
diff --git a/src/operators/verify_ssn.h b/src/operators/verify_ssn.h
@@ -26,7 +26,6 @@
 
 namespace modsecurity {
 using regex::RegexMatch;
-using regex::regex_search;
 using regex::Regex;
 
 namespace operators {
diff --git a/src/operators/verify_svnr.h b/src/operators/verify_svnr.h
@@ -12,7 +12,6 @@
 
 namespace modsecurity {
 using regex::RegexMatch;
-using regex::regex_search;
 using regex::Regex;
 
 namespace operators {
diff --git a/src/regex/regex.h b/src/regex/regex.h
@@ -81,16 +81,6 @@ class Regex {
 };
 
 
-static inline int regex_search(const std::string& s, RegexMatch *match, const Regex& regex) {
-    return regex.search(s, match);
-}
-
-
-static inline int regex_search(const std::string& s, const Regex& regex) {
-    return regex.search(s);
-}
-
-
 }  // namespace regex
 }  // namespace modsecurity
 
diff --git a/src/variables/rule.h b/src/variables/rule.h
@@ -200,23 +200,23 @@ class Rule_DictElementRegexp : public VariableRegex {
     void evaluate(Transaction *t,
         RuleWithActions *rule,
         std::vector<const VariableValue *> *l) override {
-        if (regex::regex_search("id", m_r) > 0) {
+        if (m_r.search("id") > 0) {
             Rule_DictElement::id(t, rule, l);
             return;
         }
-        if (regex::regex_search("rev", m_r) > 0) {
+        if (m_r.search("rev") > 0) {
             Rule_DictElement::rev(t, rule, l);
             return;
         }
-        if (regex::regex_search("severity", m_r) > 0) {
+        if (m_r.search("severity") > 0) {
             Rule_DictElement::severity(t, rule, l);
             return;
         }
-        if (regex::regex_search("logdata", m_r) > 0) {
+        if (m_r.search("logdata") > 0) {
             Rule_DictElement::logData(t, rule, l);
             return;
         }
-        if (regex::regex_search("msg", m_r) > 0) {
+        if (m_r.search("msg") > 0) {
             Rule_DictElement::msg(t, rule, l);
             return;
         }
diff --git a/test/regression/custom_debug_log.cc b/test/regression/custom_debug_log.cc
@@ -39,7 +39,7 @@ void CustomDebugLog::write(int level, const std::string &id,
 bool const CustomDebugLog::contains(const std::string& pattern) const {
     modsecurity::regex::Regex re(pattern);
     std::string s = m_log.str();
-    return modsecurity::regex::regex_search(s, re);
+    return re.search(s);
 }
 
 std::string const CustomDebugLog::log_messages() const {
diff --git a/test/regression/regression.cc b/test/regression/regression.cc
@@ -38,7 +38,6 @@ using modsecurity_test::ModSecurityTestResults;
 using modsecurity_test::RegressionTest;
 using modsecurity_test::RegressionTestResult;
 
-using modsecurity::regex::regex_search;
 using modsecurity::regex::RegexMatch;
 using modsecurity::regex::Regex;
 
@@ -54,7 +53,7 @@ void print_help() {
 bool contains(const std::string &s, const std::string &pattern) {
     bool ret;
     modsecurity::regex::Regex re(pattern);
-    ret = modsecurity::regex::regex_search(s, re);
+    ret = re.search(s);
     return ret;
 }
 
@@ -233,7 +232,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
             RegexMatch match;
             std::string s = modsec_rules->getParserError();
 
-            if (regex_search(s, &match, re)) {
+            if (re.search(s, &match)) {
                 if (test->m_automake_output) {
                     std::cout << ":test-result: PASS " << filename \
                         << ":" << t->name << std::endl;
diff --git a/test/unit/unit_test.cc b/test/unit/unit_test.cc
@@ -62,15 +62,15 @@ void json2bin(std::string *str) {
     modsecurity::regex::Regex re2("\\\\u([a-z0-9A-Z]{4})");
     modsecurity::regex::RegexMatch match;
 
-    while (modsecurity::regex::regex_search(*str, &match, re)) {
+    while (re.search(*str, &match)) {
         unsigned int p;
         std::string toBeReplaced = match.str();
         toBeReplaced.erase(0, 2);
         sscanf(toBeReplaced.c_str(), "%3x", &p);
         replaceAll(str, match.str(), p);
     }
 
-    while (modsecurity::regex::regex_search(*str, &match, re2)) {
+    while (re2.search(*str, &match)) {
         unsigned int p;
         std::string toBeReplaced = match.str();
         toBeReplaced.erase(0, 2);

Original file line number	Diff line number	Diff line change
`@@ -278,8 +278,7 @@ bool AuditLog::isRelevant(int status) {`
`278`	`278`	`return true;`
`279`	`279`	`}`
`280`	`280`
`281`		`- return regex::regex_search(sstatus,`
`282`		`- regex::Regex(m_relevant)) != 0;`
	`281`	`+ return regex::Regex(m_relevant).search(sstatus) != 0;`
`283`	`282`	`}`
`284`	`283`
`285`	`284`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ void InMemoryPerProcess::resolveRegularExpression(const std::string& var,`
`148`	`148`	`//}`
`149`	`149`	`//std::string content = std::string(x.first, keySize + 1,`
`150`	`150`	`// x.first.size() - keySize - 1);`
`151`		`- int ret = regex::regex_search(x.first, r);`
	`151`	`+ int ret = r.search(x.first);`
`152`	`152`	`if (ret <= 0) {`
`153`	`153`	`continue;`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ void LMDB::resolveRegularExpression(const std::string& var,`
`559`	`559`
`560`	`560`	`while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {`
`561`	`561`	`char a = reinterpret_cast<char >(key.mv_data);`
`562`		`- int ret = regex::regex_search(a, r);`
	`562`	`+ int ret = r.search(a);`
`563`	`563`	`if (ret <= 0) {`
`564`	`564`	`continue;`
`565`	`565`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,23 +200,23 @@ class Rule_DictElementRegexp : public VariableRegex {`
`200`	`200`	`void evaluate(Transaction *t,`
`201`	`201`	`RuleWithActions *rule,`
`202`	`202`	`std::vector<const VariableValue > l) override {`
`203`		`- if (regex::regex_search("id", m_r) > 0) {`
	`203`	`+ if (m_r.search("id") > 0) {`
`204`	`204`	`Rule_DictElement::id(t, rule, l);`
`205`	`205`	`return;`
`206`	`206`	`}`
`207`		`- if (regex::regex_search("rev", m_r) > 0) {`
	`207`	`+ if (m_r.search("rev") > 0) {`
`208`	`208`	`Rule_DictElement::rev(t, rule, l);`
`209`	`209`	`return;`
`210`	`210`	`}`
`211`		`- if (regex::regex_search("severity", m_r) > 0) {`
	`211`	`+ if (m_r.search("severity") > 0) {`
`212`	`212`	`Rule_DictElement::severity(t, rule, l);`
`213`	`213`	`return;`
`214`	`214`	`}`
`215`		`- if (regex::regex_search("logdata", m_r) > 0) {`
	`215`	`+ if (m_r.search("logdata") > 0) {`
`216`	`216`	`Rule_DictElement::logData(t, rule, l);`
`217`	`217`	`return;`
`218`	`218`	`}`
`219`		`- if (regex::regex_search("msg", m_r) > 0) {`
	`219`	`+ if (m_r.search("msg") > 0) {`
`220`	`220`	`Rule_DictElement::msg(t, rule, l);`
`221`	`221`	`return;`
`222`	`222`	`}`