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

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

16
src/analyzer/protocol/ncp/NCP.h
View file

@ -31,7 +31,7 @@ namespace analyzer { namespace ncp {
class NCP_Session {
public:
NCP_Session(analyzer::Analyzer* analyzer);
explicit NCP_Session(analyzer::Analyzer* analyzer);
virtual ~NCP_Session() {}
virtual void Deliver(int is_orig, int len, const u_char* data);
@ -51,7 +51,7 @@ protected:
class FrameBuffer {
public:
FrameBuffer(int header_length);
explicit FrameBuffer(int header_length);
virtual ~FrameBuffer();
// Returns true if a frame is ready
@ -80,17 +80,17 @@ public:
NCP_FrameBuffer() : FrameBuffer(NCP_TCPIP_HEADER_LENGTH) {}
protected:
void compute_msg_length();
void compute_msg_length() override;
};
class Contents_NCP_Analyzer : public tcp::TCP_SupportAnalyzer {
public:
Contents_NCP_Analyzer(Connection* conn, bool orig, NCP_Session* session);
~Contents_NCP_Analyzer();
~Contents_NCP_Analyzer() override;
protected:
virtual void DeliverStream(int len, const u_char* data, bool orig);
virtual void Undelivered(uint64 seq, int len, bool orig);
void DeliverStream(int len, const u_char* data, bool orig) override;
void Undelivered(uint64 seq, int len, bool orig) override;
NCP_FrameBuffer buffer;
NCP_Session* session;
@ -101,8 +101,8 @@ protected:
class NCP_Analyzer : public tcp::TCP_ApplicationAnalyzer {
public:
NCP_Analyzer(Connection* conn);
virtual ~NCP_Analyzer();
explicit NCP_Analyzer(Connection* conn);
~NCP_Analyzer() override;
static analyzer::Analyzer* Instantiate(Connection* conn)
{ return new NCP_Analyzer(conn); }