Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 10:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Mark one-parameter constructors as explicit & use override where possible

Browse source 
This commit marks (hopefully) ever one-parameter constructor as explicit.

It also uses override in (hopefully) all circumstances where a virtual
method is overridden.

There are a very few other minor changes - most of them were necessary
to get everything to compile (like one additional constructor). In one
case I changed an implicit operation to an explicit string conversion -
I think the automatically chosen conversion was much more convoluted.

This took longer than I want to admit but not as long as I feared :)
This commit is contained in:
Johanna Amann 2018-03-16 22:14:22 -07:00
parent 1f2bf50b49
commit 6d612ced3d
173 changed files with 1052 additions and 1046 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/RuleCondition.h
View file

@ -31,15 +31,15 @@ public:
STATE_STATELESS = 8
};
RuleConditionTCPState(int arg_tcpstates)
explicit RuleConditionTCPState(int arg_tcpstates)
{ tcpstates = arg_tcpstates; }
virtual ~RuleConditionTCPState() { }
~RuleConditionTCPState() override { }
virtual bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len);
bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len) override;
virtual void PrintDebug();
void PrintDebug() override;
private:
int tcpstates;
@ -56,13 +56,15 @@ public:
OPT_SSRR = 8,
};
RuleConditionIPOptions(int arg_options) { options = arg_options; }
virtual ~RuleConditionIPOptions() { }
explicit RuleConditionIPOptions(int arg_options) { options = arg_options; }
virtual bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len);
~RuleConditionIPOptions() override
{ }
virtual void PrintDebug();
bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len) override;
void PrintDebug() override;
private:
int options;
@ -72,12 +74,12 @@ private:
class RuleConditionSameIP : public RuleCondition {
public:
RuleConditionSameIP() { }
virtual ~RuleConditionSameIP() {}
~RuleConditionSameIP() override {}
virtual bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len);
bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len) override;
virtual void PrintDebug();
void PrintDebug() override;
};
// Implements "payload-size".
@ -88,12 +90,12 @@ public:
RuleConditionPayloadSize(uint32 arg_val, Comp arg_comp)
{ val = arg_val; comp = arg_comp; }
virtual ~RuleConditionPayloadSize() {}
~RuleConditionPayloadSize() override {}
virtual bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len);
bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len) override;
virtual void PrintDebug();
void PrintDebug() override;
private:
uint32 val;
@ -103,13 +105,13 @@ private:
// Implements "eval" which evaluates the given Bro identifier.
class RuleConditionEval : public RuleCondition {
public:
RuleConditionEval(const char* func);
virtual ~RuleConditionEval() {}
explicit RuleConditionEval(const char* func);
~RuleConditionEval() override {}
virtual bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len);
bool DoMatch(Rule* rule, RuleEndpointState* state,
const u_char* data, int len) override;
virtual void PrintDebug();
void PrintDebug() override;
private:
ID* id;
};