From df03a3fc27234e09cc4e85f2c26b6eb7d26ceee1 Mon Sep 17 00:00:00 2001 From: "Russ Combs (rucombs)" Date: Fri, 4 Jun 2021 16:09:29 +0000 Subject: [PATCH] Merge pull request #2923 in SNORT/snort3 from ~SBAIGAL/snort3:shell2 to master Squashed commit of the following: commit d6c6e803d46423198b4a7bed1c610ea10db799c5 Author: Steven Baigal (sbaigal) Date: Fri Jun 4 10:13:26 2021 -0400 control: cleanup cppcheck issues --- src/control/control.h | 4 ++-- src/host_tracker/test/host_cache_module_test.cc | 4 ++-- src/network_inspectors/rna/test/rna_module_mock.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/control/control.h b/src/control/control.h index 182740da7..09bc40ca2 100644 --- a/src/control/control.h +++ b/src/control/control.h @@ -73,8 +73,8 @@ private: bool blocked = false; #else SO_PUBLIC bool is_local() const { return false; } - SO_PUBLIC bool respond(const char* format, va_list& ap) { return false;} - SO_PUBLIC bool respond(const char* format, ...) __attribute__((format (printf, 2, 3))) { return false; } + SO_PUBLIC bool respond(const char*, va_list&) { return false;} + SO_PUBLIC bool respond(const char*, ...) __attribute__((format (printf, 2, 3))) { return false; } SO_PUBLIC static ControlConn* query_from_lua(const lua_State*) { return nullptr; } #endif }; diff --git a/src/host_tracker/test/host_cache_module_test.cc b/src/host_tracker/test/host_cache_module_test.cc index 6a495290c..aad99bc73 100644 --- a/src/host_tracker/test/host_cache_module_test.cc +++ b/src/host_tracker/test/host_cache_module_test.cc @@ -44,13 +44,13 @@ using namespace snort; static HostCacheModule module; #define LOG_MAX 128 static char logged_message[LOG_MAX+1]; - +#ifdef SHELL static ControlConn ctrlcon(1, true); ControlConn::ControlConn(int, bool) {} ControlConn::~ControlConn() {} ControlConn* ControlConn::query_from_lua(const lua_State*) { return &ctrlcon; } bool ControlConn::respond(const char*, ...) { return true; } - +#endif namespace snort { const SnortConfig* SnortConfig::get_conf() diff --git a/src/network_inspectors/rna/test/rna_module_mock.h b/src/network_inspectors/rna/test/rna_module_mock.h index 367bb92c0..a58c787b6 100644 --- a/src/network_inspectors/rna/test/rna_module_mock.h +++ b/src/network_inspectors/rna/test/rna_module_mock.h @@ -112,12 +112,13 @@ private: } // end of namespace snort void snort::main_broadcast_command(snort::AnalyzerCommand*, ControlConn*) {} +#ifdef SHELL static ControlConn s_ctrlcon(1, true); ControlConn::ControlConn(int, bool) {} ControlConn::~ControlConn() {} ControlConn* ControlConn::query_from_lua(const lua_State*) { return &s_ctrlcon; } bool ControlConn::respond(const char*, ...) { return true; } - +#endif HostCacheMac* get_host_cache_mac() { return nullptr; } DataPurgeAC::~DataPurgeAC() = default; -- 2.47.3