Simplify initialization of fileName member of Rule instances

This commit is contained in:
Eduardo Arias
2024-05-06 01:39:55 -03:00
parent 2ad87f640f
commit 2c613fb77c
12 changed files with 26 additions and 27 deletions

View File

@@ -64,8 +64,8 @@ using MatchActions = std::vector<actions::Action *>;
class Rule {
public:
Rule(std::unique_ptr<std::string> fileName, int lineNumber)
: m_fileName(*fileName),
Rule(const std::string &fileName, int lineNumber)
: m_fileName(fileName),
m_lineNumber(lineNumber),
m_phase(modsecurity::Phases::RequestHeadersPhase) {
}

View File

@@ -33,9 +33,9 @@ class RuleMarker : public Rule {
public:
RuleMarker(
const std::string &name,
std::unique_ptr<std::string> fileName,
const std::string &fileName,
int lineNumber)
: Rule(std::move(fileName), lineNumber),
: Rule(fileName, lineNumber),
m_name(name) { }
RuleMarker(const RuleMarker &r) = delete;

View File

@@ -40,7 +40,7 @@ class RuleWithActions : public Rule {
RuleWithActions(
Actions *a,
Transformations *t,
std::unique_ptr<std::string> fileName,
const std::string &fileName,
int lineNumber);
~RuleWithActions() override;

View File

@@ -42,7 +42,7 @@ class RuleWithOperator : public RuleWithActions {
variables::Variables *variables,
std::vector<actions::Action *> *actions,
Transformations *transformations,
std::unique_ptr<std::string> fileName,
const std::string &fileName,
int lineNumber);
~RuleWithOperator() override;