Renames SMatch to RegexMatch

Author: zimmerle

src/modsecurity.cc

@@ -229,9 +229,9 @@ int ModSecurity::processContentOffset(const char *content, size_t len,
     const unsigned char *buf;
     size_t jsonSize;
 
-    std::list<regex::SMatch> vars = variables.searchAll(matchString);
-    std::list<regex::SMatch> ops = operators.searchAll(matchString);
-    std::list<regex::SMatch> trans = transformations.searchAll(matchString);
+    std::list<regex::RegexMatch> vars = variables.searchAll(matchString);
+    std::list<regex::RegexMatch> ops = operators.searchAll(matchString);
+    std::list<regex::RegexMatch> trans = transformations.searchAll(matchString);
 
     g = yajl_gen_alloc(NULL);
     if (g == NULL) {

src/operators/rx.cc

@@ -51,11 +51,11 @@ bool Rx::evaluate(Transaction *transaction, RuleWithActions *rule,
         re = m_re;
     }
 
-    std::vector<regex::SMatchCapture> captures;
+    std::vector<regex::RegexMatchCapture> captures;
     re->searchOneMatch(input, captures);
 
     if (rule && rule->hasCaptureAction() && transaction) {
-        for (const regex::SMatchCapture& capture : captures) {
+        for (const regex::RegexMatchCapture& capture : captures) {
             const std::string capture_substring(input.substr(capture.m_offset,capture.m_length));
             transaction->m_collections.m_tx_collection->storeOrUpdateFirst(
                 std::to_string(capture.m_group), capture_substring);

src/operators/rx.h

@@ -26,7 +26,7 @@
 
 
 namespace modsecurity {
-using regex::SMatch;
+using regex::RegexMatch;
 using regex::regex_search;
 using regex::Regex;
 

src/operators/verify_cpf.cc

@@ -110,7 +110,7 @@ bool VerifyCPF::verify(const char *cpfnumber, int len) {
 
 bool VerifyCPF::evaluate(Transaction *t, RuleWithActions *rule,
     const std::string& input, std::shared_ptr<RuleMessage> ruleMessage) {
-    std::list<SMatch> matches;
+    std::list<RegexMatch> matches;
     bool is_cpf = false;
     int i;
 

src/operators/verify_cpf.h

@@ -25,7 +25,7 @@
 
 
 namespace modsecurity {
-using regex::SMatch;
+using regex::RegexMatch;
 using regex::regex_search;
 using regex::Regex;
 

src/operators/verify_ssn.cc

@@ -112,7 +112,7 @@ bool VerifySSN::verify(const char *ssnumber, int len) {
 
 bool VerifySSN::evaluate(Transaction *t, RuleWithActions *rule,
     const std::string& input, std::shared_ptr<RuleMessage> ruleMessage) {
-    std::list<SMatch> matches;
+    std::list<RegexMatch> matches;
     bool is_ssn = false;
     int i;
 

src/operators/verify_ssn.h

@@ -25,7 +25,7 @@
 
 
 namespace modsecurity {
-using regex::SMatch;
+using regex::RegexMatch;
 using regex::regex_search;
 using regex::Regex;
 

src/operators/verify_svnr.cc

@@ -79,7 +79,7 @@ bool VerifySVNR::verify(const char *svnrnumber, int len) {
 
 bool VerifySVNR::evaluate(Transaction *t, RuleWithActions *rule,
     const std::string& input, std::shared_ptr<RuleMessage> ruleMessage) {
-    std::list<SMatch> matches;
+    std::list<RegexMatch> matches;
     bool is_svnr = false;
     int i;
 

src/operators/verify_svnr.h

@@ -11,7 +11,7 @@
 
 
 namespace modsecurity {
-using regex::SMatch;
+using regex::RegexMatch;
 using regex::regex_search;
 using regex::Regex;
 

src/regex/regex.cc

@@ -62,12 +62,12 @@ Regex::~Regex() {
 }
 
 
-std::list<SMatch> Regex::searchAll(const std::string& s) const {
+std::list<RegexMatch> Regex::searchAll(const std::string& s) const {
     const char *subject = s.c_str();
     const std::string tmpString = std::string(s.c_str(), s.size());
     int ovector[OVECCOUNT];
     int rc, i, offset = 0;
-    std::list<SMatch> retList;
+    std::list<RegexMatch> retList;
 
     do {
         rc = pcre_exec(m_pc, m_pce, subject,
@@ -83,7 +83,7 @@ std::list<SMatch> Regex::searchAll(const std::string& s) const {
             }
             std::string match = std::string(tmpString, start, len);
             offset = start + len;
-            retList.push_front(SMatch(match, start));
+            retList.push_front(RegexMatch(match, start));
 
             if (len == 0) {
                 rc = 0;
@@ -95,7 +95,7 @@ std::list<SMatch> Regex::searchAll(const std::string& s) const {
     return retList;
 }
 
-bool Regex::searchOneMatch(const std::string& s, std::vector<SMatchCapture>& captures) const {
+bool Regex::searchOneMatch(const std::string& s, std::vector<RegexMatchCapture>& captures) const {
     const char *subject = s.c_str();
     int ovector[OVECCOUNT];
 
@@ -108,20 +108,20 @@ bool Regex::searchOneMatch(const std::string& s, std::vector<SMatchCapture>& cap
         if (end > s.size()) {
             continue;
         }
-        SMatchCapture capture(i, start, len);
+        RegexMatchCapture capture(i, start, len);
         captures.push_back(capture);
     }
 
     return (rc > 0);
 }
 
-int Regex::search(const std::string& s, SMatch *match) const {
+int Regex::search(const std::string& s, RegexMatch *match) const {
     int ovector[OVECCOUNT];
     int ret = pcre_exec(m_pc, m_pce, s.c_str(),
         s.size(), 0, 0, ovector, OVECCOUNT) > 0;
 
     if (ret > 0) {
-        *match = SMatch(
+        *match = RegexMatch(
             std::string(s, ovector[ret-1], ovector[ret] - ovector[ret-1]),
             0);
     }