Merge pull request #2920 in SNORT/snort3 from ~MDAGON/snort3:fix_platform_rt to master

Squashed commit of the following:

commit c4541b26a1e895d7674f3a52bdfabef9a25072a0
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Jun 2 17:13:12 2021 -0400

    http_inspect: update test mock api

diff --git a/src/service_inspectors/http_inspect/test/http_module_test.cc b/src/service_inspectors/http_inspect/test/http_module_test.cc
index 0d8f0fafc0c0cb81bc1f08b0f13c3f710cc8904d..23d35c7e0551a420bb55039c57fd28cb017a47eb 100755 (executable)
--- a/src/service_inspectors/http_inspect/test/http_module_test.cc
+++ b/src/service_inspectors/http_inspect/test/http_module_test.cc
@@ -70,8 +70,8 @@ HttpJsNorm::HttpJsNorm(const HttpParaList::UriParam& uri_param_, int64_t normali
 HttpJsNorm::~HttpJsNorm() = default;
 void HttpJsNorm::configure(){}
 int64_t Parameter::get_int(char const*) { return 0; }
-void FlowData::update_allocations(unsigned long) {}
-void FlowData::update_deallocations(unsigned long) {}
+void FlowData::update_allocations(size_t) {}
+void FlowData::update_deallocations(size_t) {}
 
 TEST_GROUP(http_peg_count_test)
 {

diff --git a/src/service_inspectors/http_inspect/test/http_msg_head_shared_util_test.cc b/src/service_inspectors/http_inspect/test/http_msg_head_shared_util_test.cc
index ddd840441e5893e4fd4e8a5bb5296e2dcba12996..edc2e837901c4bff360961625a1d7d495291dcc9 100644 (file)
--- a/src/service_inspectors/http_inspect/test/http_msg_head_shared_util_test.cc
+++ b/src/service_inspectors/http_inspect/test/http_msg_head_shared_util_test.cc
@@ -37,8 +37,8 @@ using namespace snort;
 // Stubs whose sole purpose is to make the test code link
 long HttpTestManager::print_amount {};
 bool HttpTestManager::print_hex {};
-void FlowData::update_allocations(unsigned long) {}
-void FlowData::update_deallocations(unsigned long) {}
+void FlowData::update_allocations(size_t) {}
+void FlowData::update_deallocations(size_t) {}
 
 // Tests for get_next_code()
 TEST_GROUP(get_next_code)

diff --git a/src/service_inspectors/http_inspect/test/http_normalizers_test.cc b/src/service_inspectors/http_inspect/test/http_normalizers_test.cc
index 29dcfefd3928ec26fae772a77a22487c41bbe02e..57258726d41a4a0a4d3fa4c801ba4996f72e18ef 100644 (file)
--- a/src/service_inspectors/http_inspect/test/http_normalizers_test.cc
+++ b/src/service_inspectors/http_inspect/test/http_normalizers_test.cc
@@ -40,8 +40,8 @@ const bool HttpEnums::is_sp_tab[256] {};
 const bool HttpEnums::is_sp_tab_quote_dquote[256] {};
 long HttpTestManager::print_amount {};
 bool HttpTestManager::print_hex {};
-void FlowData::update_allocations(unsigned long) {}
-void FlowData::update_deallocations(unsigned long) {}
+void FlowData::update_allocations(size_t) {}
+void FlowData::update_deallocations(size_t) {}
 
 TEST_GROUP(norm_decimal_integer_test) {};
 

diff --git a/src/service_inspectors/http_inspect/test/http_uri_norm_test.cc b/src/service_inspectors/http_inspect/test/http_uri_norm_test.cc
index a7e1b3fb7a612f2190c0321e604ce7432d061d96..3982153e4a3fbf33006327cf763fff936cd5cfc8 100755 (executable)
--- a/src/service_inspectors/http_inspect/test/http_uri_norm_test.cc
+++ b/src/service_inspectors/http_inspect/test/http_uri_norm_test.cc
@@ -59,8 +59,8 @@ HttpJsNorm::HttpJsNorm(const HttpParaList::UriParam& uri_param_, int64_t normali
 HttpJsNorm::~HttpJsNorm() = default;
 void HttpJsNorm::configure() {}
 int64_t Parameter::get_int(char const*) { return 0; }
-void FlowData::update_allocations(unsigned long) {}
-void FlowData::update_deallocations(unsigned long) {}
+void FlowData::update_allocations(size_t) {}
+void FlowData::update_deallocations(size_t) {}
 
 TEST_GROUP(http_inspect_uri_norm)
 {