From: Vitalii Serhiiovych Horbatov -X (vhorbato - SOFTSERVE INC at Cisco) <vhorbato@cisco.com>
Date: Thu, 28 Nov 2024 12:36:03 +0000 (+0000)
Subject: Pull request #4532: connectors: suppress cppcheck warning in std_connector test
X-Git-Tag: 3.6.0.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd8eb4195914e0244219e4db36f09439bc241c62;p=thirdparty%2Fsnort3.git

Pull request #4532: connectors: suppress cppcheck warning in std_connector test

Merge in SNORT/snort3 from ~VHORBATO/snort3:extractor_conn_fix to master

Squashed commit of the following:

commit ad96b5a1d67122607075d6883f862f4ef54eb765
Author: vhorbato <vhorbato@cisco.com>
Date:   Wed Nov 27 15:40:42 2024 +0200

    connectors: fix cppcheck warning in std_connector test
---

diff --git a/src/connectors/std_connector/test/std_connector_test.cc b/src/connectors/std_connector/test/std_connector_test.cc
index 22da974f2..dd8937a43 100644
--- a/src/connectors/std_connector/test/std_connector_test.cc
+++ b/src/connectors/std_connector/test/std_connector_test.cc
@@ -47,13 +47,13 @@ ConnectorCommon* connector_common;
 Connector* connector_transmit;
 Connector* connector_receive;
 
-struct TextLog
+struct MockLog
 {
     std::string accumulated_buffer;
     std::string flushed_buffer;
 };
 
-TextLog output_buffer;
+MockLog output_buffer;
 
 namespace snort
 {
@@ -61,31 +61,34 @@ TextLog* TextLog_Init(const char*, unsigned int = 0, size_t = 0, bool = true)
 {
     output_buffer.accumulated_buffer.clear();
     output_buffer.flushed_buffer.clear();
-    return &output_buffer;
+    return (TextLog*)&output_buffer;
 }
 
 bool TextLog_Print(TextLog* const txt, const char* fmt, ...)
 {
+    MockLog* txt_mock = (MockLog*)txt;
     va_list ap;
     va_start(ap, fmt);
     char data[100];
     vsnprintf(data, 100, fmt, ap);
-    txt->accumulated_buffer.append(data);
+    txt_mock->accumulated_buffer.append(data);
     va_end(ap);
     return true;
 }
 
 bool TextLog_Flush(TextLog* const txt)
 {
-    txt->flushed_buffer.append(txt->accumulated_buffer);
-    txt->accumulated_buffer.clear();
+    MockLog* txt_mock = (MockLog*)txt;
+    txt_mock->flushed_buffer.append(txt_mock->accumulated_buffer);
+    txt_mock->accumulated_buffer.clear();
     return true;
 }
 
-void TextLog_Term(TextLog*)
+void TextLog_Term(TextLog* txt)
 {
-    output_buffer.accumulated_buffer.clear();
-    output_buffer.flushed_buffer.clear();
+    MockLog* txt_mock = (MockLog*)txt;
+    txt_mock->accumulated_buffer.clear();
+    txt_mock->flushed_buffer.clear();
 }
 
 const char* get_instance_file(std::string& file, const char* name) { file += name; return nullptr; }