From: Oleksandr Stepanov -X (ostepano - SOFTSERVE INC at Cisco) <ostepano@cisco.com>
Date: Fri, 25 Apr 2025 13:51:37 +0000 (+0000)
Subject: Pull request #4712: mp_unix_transport: clang compilation fix
X-Git-Tag: 3.7.4.0~11
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9450d81807ab5322943365c6b032108f23bc6c00;p=thirdparty%2Fsnort3.git

Pull request #4712: mp_unix_transport: clang compilation fix

Merge in SNORT/snort3 from ~OSTEPANO/snort3:crunch_fix to master

Squashed commit of the following:

commit 2a9ddee769279b2a03d32ac93d84e9369bc7463e
Author: Oleksandr Stepanov <ostepano@cisco.com>
Date:   Fri Apr 25 07:08:40 2025 -0400

    mp_unix_transport: clang compilation fix
---

diff --git a/src/mp_transport/mp_unix_transport/test/unix_transport_test.cc b/src/mp_transport/mp_unix_transport/test/unix_transport_test.cc
index d611e15b3..b3a9f5b96 100644
--- a/src/mp_transport/mp_unix_transport/test/unix_transport_test.cc
+++ b/src/mp_transport/mp_unix_transport/test/unix_transport_test.cc
@@ -225,16 +225,16 @@ static int s_connect_return = 1;
 int socket (int, int, int) __THROW { test_socket_calls++; return s_socket_return; }
 int bind (int, const struct sockaddr*, socklen_t) __THROW { test_bind_calls++; return s_bind_return; }
 int listen (int, int) __THROW { test_listen_calls++; return s_listen_return; }
-int connect (int, const struct sockaddr*, socklen_t) __THROW { test_connect_calls++; return s_connect_return; }
 int unlink (const char *__name) __THROW { return 0;};
 #else
 int socket (int, int, int) { test_socket_calls++; return s_socket_return; }
 int bind (int, const struct sockaddr*, socklen_t) { test_bind_calls++; return s_bind_return; }
 int listen (int, int) { test_listen_calls++; return s_listen_return; }
-int connect (int, const struct sockaddr*, socklen_t) { test_connect_calls++; return s_connect_return; }
 int unlink (const char *__name) { return 0;};
 #endif
 
+int connect (int, const struct sockaddr*, socklen_t) { test_connect_calls++; return s_connect_return; }
+
 int fcntl (int __fd, int __cmd, ...) { return 0;}
 ssize_t send (int, const void*, size_t n, int) { return n; }
 
@@ -316,7 +316,7 @@ TEST_GROUP(unix_transport_test_messaging)
         snort_instance_id = 1;
         test_transport_message_1->configure(&test_snort_config);
         test_transport_message_1->init_connection();
-        test_transport_message_1->register_receive_handler([reciveved_1_msg_cnt](const snort::MPEventInfo& e)
+        test_transport_message_1->register_receive_handler([](const snort::MPEventInfo& e)
         {
             reciveved_1_msg_cnt++;
         });
@@ -327,7 +327,7 @@ TEST_GROUP(unix_transport_test_messaging)
         snort_instance_id = 2;
         test_transport_message_2->configure(&test_snort_config);
         test_transport_message_2->init_connection();
-        test_transport_message_2->register_receive_handler([reciveved_2_msg_cnt](const snort::MPEventInfo& e)
+        test_transport_message_2->register_receive_handler([](const snort::MPEventInfo& e)
         {
             reciveved_2_msg_cnt++;
         });