From: Vitalii Serhiiovych Horbatov -X (vhorbato - SOFTSERVE INC at Cisco) Date: Mon, 21 Oct 2024 20:41:36 +0000 (+0000) Subject: Pull request #4488: side_channel: fix compiler warning in side channel formatting... X-Git-Tag: 3.5.1.0~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72b048e3fbac5bef7381dfcdc78e1b50fb91cfb6;p=thirdparty%2Fsnort3.git Pull request #4488: side_channel: fix compiler warning in side channel formatting test Merge in SNORT/snort3 from ~VHORBATO/snort3:sc_format_warn_fix to master Squashed commit of the following: commit 63b51eb539f5eeebc9c5f5897657a8e60fd829a8 Author: vhorbato Date: Mon Oct 21 12:05:44 2024 +0300 side_channel: fix compiler warning in side channel formatting test --- diff --git a/src/side_channel/side_channel_format.cc b/src/side_channel/side_channel_format.cc index 3c55f4383..2d109d66b 100644 --- a/src/side_channel/side_channel_format.cc +++ b/src/side_channel/side_channel_format.cc @@ -132,15 +132,21 @@ ConnectorMsg from_text(const char* str_ptr, uint32_t size) #ifdef UNIT_TEST #include "catch/snort_catch.h" -#define CHECK_CMSG(cmsg, expected_hdr, expected_msg) \ - REQUIRE(cmsg.get_data()); \ - REQUIRE(cmsg.get_length() == sizeof(expected_hdr) + sizeof(expected_msg)); \ - CHECK(memcmp(cmsg.get_data(), &expected_hdr, sizeof(expected_hdr)) == 0); \ - CHECK(memcmp(cmsg.get_data() + sizeof(expected_hdr), expected_msg, sizeof(expected_msg)) == 0); \ - -#define CHECK_NO_CMSG(cmsg) \ - REQUIRE(cmsg.get_data() == nullptr); \ - REQUIRE(cmsg.get_length() == 0); \ +#define CHECK_CMSG(cmsg, expected_hdr, expected_msg) \ + do \ + { \ + REQUIRE(cmsg.get_data()); \ + REQUIRE(cmsg.get_length() == sizeof(expected_hdr) + sizeof(expected_msg)); \ + CHECK(memcmp(cmsg.get_data(), &expected_hdr, sizeof(expected_hdr)) == 0); \ + CHECK(memcmp(cmsg.get_data() + sizeof(expected_hdr), expected_msg, sizeof(expected_msg)) == 0); \ + } while ( false ) + +#define CHECK_NO_CMSG(cmsg) \ + do \ + { \ + REQUIRE(cmsg.get_data() == nullptr); \ + REQUIRE(cmsg.get_length() == 0); \ + } while ( false ) TEST_CASE("hdr_to_text", "[side_channel]") {