From c7db9aa50d8a1c123e8a6825718b84b3a782e3c7 Mon Sep 17 00:00:00 2001
From: Victor Julien <vjulien@oisf.net>
Date: Sun, 6 Feb 2022 13:45:58 +0100
Subject: [PATCH] output/file: use unique thread data name

---
 src/output-file.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/output-file.c b/src/output-file.c
index b05686d329..c2a7027540 100644
--- a/src/output-file.c
+++ b/src/output-file.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
@@ -38,12 +38,12 @@ bool g_file_logger_enabled = false;
 
 /** per thread data for this module, contains a list of per thread
  *  data for the packet loggers. */
-typedef struct OutputLoggerThreadData_ {
+typedef struct OutputFileLoggerThreadData_ {
     OutputLoggerThreadStore *store;
 #ifdef HAVE_MAGIC
     magic_t magic_ctx;
 #endif
-} OutputLoggerThreadData;
+} OutputFileLoggerThreadData;
 
 /* logger instance, a module + a output ctx,
  * it's perfectly valid that have multiple instances of the same
@@ -105,11 +105,8 @@ static void CloseFile(const Packet *p, Flow *f, File *file)
     file->flags |= FILE_LOGGED;
 }
 
-static void OutputFileLogFfc(ThreadVars *tv,
-        OutputLoggerThreadData *op_thread_data,
-        Packet *p,
-        FileContainer *ffc, const bool file_close, const bool file_trunc,
-        uint8_t dir)
+static void OutputFileLogFfc(ThreadVars *tv, OutputFileLoggerThreadData *op_thread_data, Packet *p,
+        FileContainer *ffc, const bool file_close, const bool file_trunc, uint8_t dir)
 {
     SCLogDebug("ffc %p", ffc);
     if (ffc != NULL) {
@@ -170,7 +167,7 @@ static TmEcode OutputFileLog(ThreadVars *tv, Packet *p, void *thread_data)
         return TM_ECODE_OK;
     }
 
-    OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data;
+    OutputFileLoggerThreadData *op_thread_data = (OutputFileLoggerThreadData *)thread_data;
 
     /* no flow, no files */
     Flow * const f = p->flow;
@@ -205,7 +202,7 @@ static TmEcode OutputFileLog(ThreadVars *tv, Packet *p, void *thread_data)
  *  loggers */
 static TmEcode OutputFileLogThreadInit(ThreadVars *tv, const void *initdata, void **data)
 {
-    OutputLoggerThreadData *td = SCMalloc(sizeof(*td));
+    OutputFileLoggerThreadData *td = SCMalloc(sizeof(*td));
     if (td == NULL)
         return TM_ECODE_FAILED;
     memset(td, 0x00, sizeof(*td));
@@ -255,7 +252,7 @@ static TmEcode OutputFileLogThreadInit(ThreadVars *tv, const void *initdata, voi
 
 static TmEcode OutputFileLogThreadDeinit(ThreadVars *tv, void *thread_data)
 {
-    OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data;
+    OutputFileLoggerThreadData *op_thread_data = (OutputFileLoggerThreadData *)thread_data;
     OutputLoggerThreadStore *store = op_thread_data->store;
     OutputFileLogger *logger = list;
 
@@ -280,7 +277,7 @@ static TmEcode OutputFileLogThreadDeinit(ThreadVars *tv, void *thread_data)
 
 static void OutputFileLogExitPrintStats(ThreadVars *tv, void *thread_data)
 {
-    OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data;
+    OutputFileLoggerThreadData *op_thread_data = (OutputFileLoggerThreadData *)thread_data;
     OutputLoggerThreadStore *store = op_thread_data->store;
     OutputFileLogger *logger = list;