From 27d134f10d83ceb7bf661fd64ae18b6c7ce42e2c Mon Sep 17 00:00:00 2001 From: "Tom Peters (thopeter)" Date: Wed, 2 Jun 2021 23:56:43 +0000 Subject: [PATCH] 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 Date: Wed Jun 2 17:13:12 2021 -0400 http_inspect: update test mock api --- src/service_inspectors/http_inspect/test/http_module_test.cc | 4 ++-- .../http_inspect/test/http_msg_head_shared_util_test.cc | 4 ++-- .../http_inspect/test/http_normalizers_test.cc | 4 ++-- .../http_inspect/test/http_uri_norm_test.cc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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 0d8f0fafc..23d35c7e0 100755 --- 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 ddd840441..edc2e8379 100644 --- 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 29dcfefd3..57258726d 100644 --- 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 a7e1b3fb7..3982153e4 100755 --- 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) { -- 2.47.3