Renames SMatch to RegexMatch

This commit is contained in:
Felipe Zimmerle
2019-01-18 18:05:31 -03:00
parent d3f9974d52
commit 57fc3b5084
11 changed files with 24 additions and 24 deletions

View File

@@ -40,7 +40,7 @@ using modsecurity_test::RegressionTest;
using modsecurity_test::RegressionTestResult;
using modsecurity::regex::regex_search;
using modsecurity::regex::SMatch;
using modsecurity::regex::RegexMatch;
using modsecurity::regex::Regex;
std::string default_test_path = "test-cases/regression";
@@ -207,7 +207,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
}
Regex re(t->parser_error);
SMatch match;
RegexMatch match;
std::string s = modsec_rules->getParserError();
if (regex_search(s, &match, re)) {

View File

@@ -60,7 +60,7 @@ void replaceAll(std::string *s, const std::string &search,
void json2bin(std::string *str) {
modsecurity::regex::Regex re("\\\\x([a-z0-9A-Z]{2})");
modsecurity::regex::Regex re2("\\\\u([a-z0-9A-Z]{4})");
modsecurity::regex::SMatch match;
modsecurity::regex::RegexMatch match;
while (modsecurity::regex::regex_search(*str, &match, re)) {
unsigned int p;