diff --git a/src/Conn.h b/src/Conn.h index 8d1b5b974b..5b26d339ca 100644 --- a/src/Conn.h +++ b/src/Conn.h @@ -401,7 +401,6 @@ public: void Dispatch(double t, bool is_expire) override; protected: - ConnectionTimer() = default; void Init(Connection* conn, timer_func timer, bool do_expire); diff --git a/src/Reassem.h b/src/Reassem.h index 2291edb3ee..c2b9dcc203 100644 --- a/src/Reassem.h +++ b/src/Reassem.h @@ -292,7 +292,6 @@ public: void SetMaxOldBlocks(uint32_t count) { max_old_blocks = count; } protected: - Reassembler() { } friend class DataBlockList; diff --git a/src/Timer.h b/src/Timer.h index 6acb8f7dd0..433063ece4 100644 --- a/src/Timer.h +++ b/src/Timer.h @@ -65,7 +65,7 @@ public: void Describe(ODesc* d) const; protected: - Timer() = default; + TimerType type{}; }; diff --git a/src/analyzer/Analyzer.cc b/src/analyzer/Analyzer.cc index b24dc88ae4..8b1ce385c5 100644 --- a/src/analyzer/Analyzer.cc +++ b/src/analyzer/Analyzer.cc @@ -22,13 +22,12 @@ public: void Dispatch(double t, bool is_expire) override; protected: - AnalyzerTimer() : analyzer(), timer(), do_expire() {} void Init(Analyzer* analyzer, analyzer_timer_func timer, int do_expire); - Analyzer* analyzer; + Analyzer* analyzer = nullptr; analyzer_timer_func timer; - int do_expire; + int do_expire = 0; }; } // namespace zeek::analyzer diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.h b/src/analyzer/protocol/tcp/TCP_Reassembler.h index 4993ea431b..ccd460c32a 100644 --- a/src/analyzer/protocol/tcp/TCP_Reassembler.h +++ b/src/analyzer/protocol/tcp/TCP_Reassembler.h @@ -82,7 +82,6 @@ public: { return seq + length <= seq_to_skip; } private: - TCP_Reassembler() { } void Undelivered(uint64_t up_to_seq) override; void Gap(uint64_t seq, uint64_t len); diff --git a/src/file_analysis/FileReassembler.cc b/src/file_analysis/FileReassembler.cc index 629f366de8..84261c49ea 100644 --- a/src/file_analysis/FileReassembler.cc +++ b/src/file_analysis/FileReassembler.cc @@ -12,11 +12,6 @@ FileReassembler::FileReassembler(File *f, uint64_t starting_offset) { } -FileReassembler::FileReassembler() - : zeek::Reassembler(), the_file(nullptr), flushing(false) - { - } - FileReassembler::~FileReassembler() { } diff --git a/src/file_analysis/FileReassembler.h b/src/file_analysis/FileReassembler.h index 0924198235..c04c85aeab 100644 --- a/src/file_analysis/FileReassembler.h +++ b/src/file_analysis/FileReassembler.h @@ -48,14 +48,13 @@ public: { return flushing; } protected: - FileReassembler(); void Undelivered(uint64_t up_to_seq) override; void BlockInserted(zeek::DataBlockMap::const_iterator it) override; void Overlap(const u_char* b1, const u_char* b2, uint64_t n) override; - File* the_file; - bool flushing; + File* the_file = nullptr; + bool flushing = false; }; } // namespace analyzer::*