From: Michael Altizer <mialtize@cisco.com>
Date: Mon, 22 Jul 2019 04:48:12 +0000 (-0400)
Subject: build: Fix miscellaneous cppcheck warnings
X-Git-Tag: 3.0.0-259~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f9f888dfa49f625b88c8de470b216ec839b2e8f;p=thirdparty%2Fsnort3.git

build: Fix miscellaneous cppcheck warnings
---

diff --git a/src/flow/test/flow_stash_test.cc b/src/flow/test/flow_stash_test.cc
index ffd1200e4..87543e258 100644
--- a/src/flow/test/flow_stash_test.cc
+++ b/src/flow/test/flow_stash_test.cc
@@ -135,12 +135,12 @@ void DataBus::_publish(const char* key, DataEvent& e, Flow* f)
 
 TEST_GROUP(stash_tests)
 {
-    void setup()
+    void setup() override
     {
         DB = new DataBus();
     }
 
-    void teardown()
+    void teardown() override
     {
         delete DB;
     }
diff --git a/src/network_inspectors/appid/test/app_info_table_test.cc b/src/network_inspectors/appid/test/app_info_table_test.cc
index 019422fc4..f4152e5bb 100644
--- a/src/network_inspectors/appid/test/app_info_table_test.cc
+++ b/src/network_inspectors/appid/test/app_info_table_test.cc
@@ -68,12 +68,12 @@ AppInfoTableEntry* add_static_entry(AppId id, const char* name)
 
 TEST_GROUP(app_info_table)
 {
-    void setup()
+    void setup() override
     {
         MemoryLeakWarningPlugin::turnOffNewDeleteOverloads();
     }
 
-    void teardown()
+    void teardown() override
     {
         app_info_mgr.cleanup_appid_info_table();
         MemoryLeakWarningPlugin::turnOnNewDeleteOverloads();
diff --git a/src/network_inspectors/appid/test/tp_mock.cc b/src/network_inspectors/appid/test/tp_mock.cc
index 3fb4309bc..0372357b4 100644
--- a/src/network_inspectors/appid/test/tp_mock.cc
+++ b/src/network_inspectors/appid/test/tp_mock.cc
@@ -54,39 +54,39 @@ public:
 
     // Hack: use cfg to manipulate pinit to return 1, so we can hit the
     // if (ret != 0) case in tp_lib_handler.cc.
-    int pinit(ThirdPartyConfig& cfg)
+    int pinit(ThirdPartyConfig& cfg) override
     {
         cerr << WhereMacro << endl;
         return cfg.tp_appid_config.empty() ? 1 : 0;
     }
 
-    int tinit() { return 0; }
-    int reconfigure(const ThirdPartyConfig&) { return 0; }
-    int pfini()
+    int tinit() override { return 0; }
+    int reconfigure(const ThirdPartyConfig&) override { return 0; }
+    int pfini() override
     {
         cerr << WhereMacro << endl;
         return 0;
     }
 
-    int tfini() { return 0; }
-    int print_stats() { return 0; }
-    int reset_stats() { return 0; }
+    int tfini() override { return 0; }
+    int print_stats() override { return 0; }
+    int reset_stats() override { return 0; }
 };
 
 class ThirdPartyAppIDSessionImpl : public ThirdPartyAppIDSession
 {
 public:
 
-    bool reset() { return 1; }
+    bool reset() override { return 1; }
     TPState process(const snort::Packet&, AppidSessionDirection, vector<AppId>&,
-        ThirdPartyAppIDAttributeData&) { return TP_STATE_INIT; }
-
-    int disable_flags(uint32_t) { return 0; }
-    TPState get_state() { return state; }
-    void set_state(TPState s) { state=s; }
-    void clear_attr(TPSessionAttr attr) { flags &= ~attr; }
-    void set_attr(TPSessionAttr attr) { flags |= attr; }
-    unsigned get_attr(TPSessionAttr attr) { return flags & attr; }
+        ThirdPartyAppIDAttributeData&) override { return TP_STATE_INIT; }
+
+    int disable_flags(uint32_t) override { return 0; }
+    TPState get_state() override { return state; }
+    void set_state(TPState s) override { state=s; }
+    void clear_attr(TPSessionAttr attr) override { flags &= ~attr; }
+    void set_attr(TPSessionAttr attr) override { flags |= attr; }
+    unsigned get_attr(TPSessionAttr attr) override { return flags & attr; }
 
 private:
     unsigned flags = 0;
diff --git a/src/service_inspectors/sip/test/sip_splitter_body_search_test.cc b/src/service_inspectors/sip/test/sip_splitter_body_search_test.cc
index 34daa9470..6c44548cd 100644
--- a/src/service_inspectors/sip/test/sip_splitter_body_search_test.cc
+++ b/src/service_inspectors/sip/test/sip_splitter_body_search_test.cc
@@ -35,7 +35,7 @@ TEST_GROUP(sip_splitter_body_search_test)
 {
     SipSplitterUT ssut = SipSplitterUT(SipSplitter(true));
 
-    void setup()
+    void setup() override
     {
         ssut.splitter_reset_states();
     }
diff --git a/src/service_inspectors/sip/test/sip_splitter_scan_test.cc b/src/service_inspectors/sip/test/sip_splitter_scan_test.cc
index 8ff0405c6..d17b38eb1 100644
--- a/src/service_inspectors/sip/test/sip_splitter_scan_test.cc
+++ b/src/service_inspectors/sip/test/sip_splitter_scan_test.cc
@@ -35,7 +35,7 @@ TEST_GROUP(sip_splitter_scan_test)
 {
     SipSplitterUT ssut = SipSplitterUT(SipSplitter(true));
 
-    void setup()
+    void setup() override
     {
         ssut.splitter_reset_states();
     }
diff --git a/src/service_inspectors/sip/test/sip_splitter_test.cc b/src/service_inspectors/sip/test/sip_splitter_test.cc
index d87e0aaf4..592cc80c2 100644
--- a/src/service_inspectors/sip/test/sip_splitter_test.cc
+++ b/src/service_inspectors/sip/test/sip_splitter_test.cc
@@ -36,7 +36,7 @@ TEST_GROUP(sip_splitter_test)
 {
     SipSplitterUT ssut = SipSplitterUT(SipSplitter(true));
 
-    void setup()
+    void setup() override
     {
         ssut.splitter_reset_states();
     }
diff --git a/src/stream/tcp/test/tcp_normalizer_test.cc b/src/stream/tcp/test/tcp_normalizer_test.cc
index 59473aaea..eed601ea4 100644
--- a/src/stream/tcp/test/tcp_normalizer_test.cc
+++ b/src/stream/tcp/test/tcp_normalizer_test.cc
@@ -102,16 +102,6 @@ NormMode Normalize_GetMode(NormFlags )
 
 TEST_GROUP(tcp_normalizers)
 {
-    //Flow* flow = nullptr;
-    //TcpSession* session = nullptr;
-
-    void setup()
-    {
-    }
-
-    void teardown()
-    {
-    }
 };
 
 TEST(tcp_normalizers, os_policy)
diff --git a/tools/snort2lua/data/data_types/dt_var.cc b/tools/snort2lua/data/data_types/dt_var.cc
index 045c9b4ad..a18e0e890 100644
--- a/tools/snort2lua/data/data_types/dt_var.cc
+++ b/tools/snort2lua/data/data_types/dt_var.cc
@@ -54,7 +54,7 @@ std::string Variable::get_value(DataApi* ld)
     return variable;
 }
 
-void Variable::set_value(std::string val, bool quoted)
+void Variable::set_value(const std::string& val, bool quoted)
 {
     VarData* vd = new VarData();
     vd->type = quoted ? VarType::STRING : VarType::VARIABLE;
diff --git a/tools/snort2lua/data/data_types/dt_var.h b/tools/snort2lua/data/data_types/dt_var.h
index 1e1328d1d..e68888c3f 100644
--- a/tools/snort2lua/data/data_types/dt_var.h
+++ b/tools/snort2lua/data/data_types/dt_var.h
@@ -35,7 +35,7 @@ public:
     inline const std::string& get_name() { return name; }
     std::string get_value(DataApi*);
     bool add_value(std::string);
-    void set_value(std::string, bool quoted);
+    void set_value(const std::string&, bool quoted);
     
     void set_print_whitespace(bool w)
     { print_whitespace = w; }