From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 30 Aug 2024 13:45:33 +0000 (-0600)
Subject: output-filedata: remove ThreadExitPrintStats callback
X-Git-Tag: suricata-8.0.0-beta1~908
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a93bd8a3879596c8f50520c4e65aa72a91aed434;p=thirdparty%2Fsuricata.git

output-filedata: remove ThreadExitPrintStats callback

Not used.

Ticket: #7227
---

diff --git a/src/output-filedata.c b/src/output-filedata.c
index daaab1bcc4..e3b038d7af 100644
--- a/src/output-filedata.c
+++ b/src/output-filedata.c
@@ -47,15 +47,12 @@ typedef struct OutputFiledataLogger_ {
     LoggerId logger_id;
     ThreadInitFunc ThreadInit;
     ThreadDeinitFunc ThreadDeinit;
-    ThreadExitPrintStatsFunc ThreadExitPrintStats;
 } OutputFiledataLogger;
 
 static OutputFiledataLogger *list = NULL;
 
-int OutputRegisterFiledataLogger(LoggerId id, const char *name,
-    FiledataLogger LogFunc, OutputCtx *output_ctx, ThreadInitFunc ThreadInit,
-    ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats)
+int OutputRegisterFiledataLogger(LoggerId id, const char *name, FiledataLogger LogFunc,
+        OutputCtx *output_ctx, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit)
 {
     OutputFiledataLogger *op = SCCalloc(1, sizeof(*op));
     if (op == NULL)
@@ -67,7 +64,6 @@ int OutputRegisterFiledataLogger(LoggerId id, const char *name,
     op->logger_id = id;
     op->ThreadInit = ThreadInit;
     op->ThreadDeinit = ThreadDeinit;
-    op->ThreadExitPrintStats = ThreadExitPrintStats;
 
     if (list == NULL)
         list = op;
diff --git a/src/output-filedata.h b/src/output-filedata.h
index 316d998dd7..0fb034a9a4 100644
--- a/src/output-filedata.h
+++ b/src/output-filedata.h
@@ -49,10 +49,8 @@ void OutputFiledataLogFfc(ThreadVars *tv, OutputFiledataLoggerThreadData *td, Pa
 typedef int (*FiledataLogger)(ThreadVars *, void *thread_data, const Packet *, File *, void *tx,
         const uint64_t tx_id, const uint8_t *, uint32_t, uint8_t, uint8_t dir);
 
-int OutputRegisterFiledataLogger(LoggerId id, const char *name,
-    FiledataLogger LogFunc, OutputCtx *, ThreadInitFunc ThreadInit,
-    ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats);
+int OutputRegisterFiledataLogger(LoggerId id, const char *name, FiledataLogger LogFunc, OutputCtx *,
+        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit);
 
 void OutputFiledataLoggerRegister(void);
 
diff --git a/src/output-filestore.c b/src/output-filestore.c
index 5960f4ea47..f9a660f56e 100644
--- a/src/output-filestore.c
+++ b/src/output-filestore.c
@@ -506,9 +506,8 @@ static OutputInitResult OutputFilestoreLogInitCtx(ConfNode *conf)
 void OutputFilestoreRegister(void)
 {
     OutputRegisterFiledataModule(LOGGER_FILE_STORE, MODULE_NAME, "file-store",
-            OutputFilestoreLogInitCtx, OutputFilestoreLogger,
-            OutputFilestoreLogThreadInit, OutputFilestoreLogThreadDeinit,
-            NULL);
+            OutputFilestoreLogInitCtx, OutputFilestoreLogger, OutputFilestoreLogThreadInit,
+            OutputFilestoreLogThreadDeinit);
 
     SC_ATOMIC_INIT(filestore_open_file_cnt);
     SC_ATOMIC_SET(filestore_open_file_cnt, 0);
diff --git a/src/output.c b/src/output.c
index 36f23edeca..da984aec51 100644
--- a/src/output.c
+++ b/src/output.c
@@ -428,11 +428,9 @@ error:
  *
  * \retval Returns 0 on success, -1 on failure.
  */
-void OutputRegisterFiledataModule(LoggerId id, const char *name,
-    const char *conf_name, OutputInitFunc InitFunc,
-    FiledataLogger FiledataLogFunc, ThreadInitFunc ThreadInit,
-    ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats)
+void OutputRegisterFiledataModule(LoggerId id, const char *name, const char *conf_name,
+        OutputInitFunc InitFunc, FiledataLogger FiledataLogFunc, ThreadInitFunc ThreadInit,
+        ThreadDeinitFunc ThreadDeinit)
 {
     if (unlikely(FiledataLogFunc == NULL)) {
         goto error;
@@ -450,7 +448,6 @@ void OutputRegisterFiledataModule(LoggerId id, const char *name,
     module->FiledataLogFunc = FiledataLogFunc;
     module->ThreadInit = ThreadInit;
     module->ThreadDeinit = ThreadDeinit;
-    module->ThreadExitPrintStats = ThreadExitPrintStats;
     TAILQ_INSERT_TAIL(&output_modules, module, entries);
 
     SCLogDebug("Filedata logger \"%s\" registered.", name);
diff --git a/src/output.h b/src/output.h
index f30e3c37ea..81ed9394bf 100644
--- a/src/output.h
+++ b/src/output.h
@@ -122,7 +122,7 @@ void OutputRegisterFileSubModule(LoggerId id, const char *parent_name, const cha
 
 void OutputRegisterFiledataModule(LoggerId id, const char *name, const char *conf_name,
         OutputInitFunc InitFunc, FiledataLogger FiledataLogFunc, ThreadInitFunc ThreadInit,
-        ThreadDeinitFunc ThreadDeinit, ThreadExitPrintStatsFunc ThreadExitPrintStats);
+        ThreadDeinitFunc ThreadDeinit);
 
 void OutputRegisterFlowSubModule(LoggerId id, const char *parent_name, const char *name,
         const char *conf_name, OutputInitSubFunc InitFunc, FlowLogger FlowLogFunc,
diff --git a/src/runmodes.c b/src/runmodes.c
index c55f381de5..3ad5f865ab 100644
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -631,9 +631,8 @@ static void SetupOutput(
         }
     } else if (module->FiledataLogFunc) {
         SCLogDebug("%s is a filedata logger", module->name);
-        OutputRegisterFiledataLogger(module->logger_id, module->name,
-            module->FiledataLogFunc, output_ctx, module->ThreadInit,
-            module->ThreadDeinit, module->ThreadExitPrintStats);
+        OutputRegisterFiledataLogger(module->logger_id, module->name, module->FiledataLogFunc,
+                output_ctx, module->ThreadInit, module->ThreadDeinit);
         filedata_logger_count++;
     } else if (module->FileLogFunc) {
         SCLogDebug("%s is a file logger", module->name);