Cosmetic changes: applies changes suggested by static analysis

This commit is contained in:
Felipe Zimmerle
2016-07-12 00:46:12 -03:00
parent 247f24c5bb
commit 4078677b7f
26 changed files with 139 additions and 122 deletions

View File

@@ -35,21 +35,36 @@ class Action {
public:
explicit Action(const std::string& _action)
: action_kind(2),
m_isNone(false),
m_name(""),
m_parser_payload(""),
m_isNone(false),
temporaryAction(false) {
set_name_and_payload(_action);
}
explicit Action(const std::string& _action, int kind)
: action_kind(kind),
m_isNone(false),
m_name(""),
m_parser_payload(""),
m_isNone(false),
temporaryAction(false) {
set_name_and_payload(_action);
}
virtual ~Action() { }
virtual std::string evaluate(std::string exp,
Transaction *transaction);
virtual bool evaluate(Rule *rule, Transaction *transaction);
virtual bool evaluate(Rule *rule, Transaction *transaction,
RuleMessage *ruleMessage) {
return evaluate(rule, transaction);
}
virtual bool init(std::string *error) { return true; }
virtual bool isDisruptive() { return false; }
virtual void fillIntervention(ModSecurityIntervention *intervention);
static Action *instantiate(const std::string& name);
void set_name_and_payload(const std::string& data) {
size_t pos = data.find(":");
std::string t = "t:";
@@ -72,7 +87,12 @@ class Action {
}
}
virtual ~Action() { }
bool m_isNone;
bool temporaryAction;
int action_kind;
std::string m_name;
std::string m_parser_payload;
/**
*
* Define the action kind regarding to the execution time.
@@ -106,27 +126,6 @@ class Action {
};
virtual std::string evaluate(std::string exp,
Transaction *transaction);
virtual bool evaluate(Rule *rule, Transaction *transaction);
virtual bool evaluate(Rule *rule, Transaction *transaction,
RuleMessage *ruleMessage) {
return evaluate(rule, transaction);
}
virtual bool init(std::string *error) { return true; }
virtual bool isDisruptive() { return false; }
virtual void fillIntervention(ModSecurityIntervention *intervention);
static Action *instantiate(const std::string& name);
bool temporaryAction;
std::string m_name;
std::string m_parser_payload;
bool m_isNone;
int action_kind;
};