From: Victor Julien <vjulien@oisf.net>
Date: Sun, 6 Feb 2022 12:54:09 +0000 (+0100)
Subject: output/streaming: use unique thread data name
X-Git-Tag: suricata-7.0.0-beta1~926
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5fd0d4f76f27a73680199946876ddfd78151217;p=thirdparty%2Fsuricata.git

output/streaming: use unique thread data name
---

diff --git a/src/output-streaming.c b/src/output-streaming.c
index 5840217729..77d2a98f11 100644
--- a/src/output-streaming.c
+++ b/src/output-streaming.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2014 Open Information Security Foundation
+/* Copyright (C) 2007-2022 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -40,10 +40,10 @@
 
 /** per thread data for this module, contains a list of per thread
  *  data for the packet loggers. */
-typedef struct OutputLoggerThreadData_ {
+typedef struct OutputStreamingLoggerThreadData_ {
     OutputLoggerThreadStore *store;
     uint32_t loggers;
-} OutputLoggerThreadData;
+} OutputStreamingLoggerThreadData;
 
 /* logger instance, a module + a output ctx,
  * it's perfectly valid that have multiple instances of the same
@@ -299,7 +299,8 @@ static TmEcode OutputStreamingLog(ThreadVars *tv, Packet *p, void *thread_data)
         return TM_ECODE_OK;
     }
 
-    OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data;
+    OutputStreamingLoggerThreadData *op_thread_data =
+            (OutputStreamingLoggerThreadData *)thread_data;
     OutputStreamingLogger *logger = list;
     OutputLoggerThreadStore *store = op_thread_data->store;
 
@@ -364,7 +365,7 @@ static TmEcode OutputStreamingLog(ThreadVars *tv, Packet *p, void *thread_data)
  *  This will run the thread init functions for the individual registered
  *  loggers */
 static TmEcode OutputStreamingLogThreadInit(ThreadVars *tv, const void *initdata, void **data) {
-    OutputLoggerThreadData *td = SCMalloc(sizeof(*td));
+    OutputStreamingLoggerThreadData *td = SCMalloc(sizeof(*td));
     if (td == NULL)
         return TM_ECODE_FAILED;
     memset(td, 0x00, sizeof(*td));
@@ -407,7 +408,8 @@ static TmEcode OutputStreamingLogThreadInit(ThreadVars *tv, const void *initdata
 }
 
 static TmEcode OutputStreamingLogThreadDeinit(ThreadVars *tv, void *thread_data) {
-    OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data;
+    OutputStreamingLoggerThreadData *op_thread_data =
+            (OutputStreamingLoggerThreadData *)thread_data;
     OutputLoggerThreadStore *store = op_thread_data->store;
     OutputStreamingLogger *logger = list;
 
@@ -427,7 +429,8 @@ static TmEcode OutputStreamingLogThreadDeinit(ThreadVars *tv, void *thread_data)
 }
 
 static void OutputStreamingLogExitPrintStats(ThreadVars *tv, void *thread_data) {
-    OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data;
+    OutputStreamingLoggerThreadData *op_thread_data =
+            (OutputStreamingLoggerThreadData *)thread_data;
     OutputLoggerThreadStore *store = op_thread_data->store;
     OutputStreamingLogger *logger = list;