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

output-file: remove ThreadExitPrintStats callback

Not used.

Ticket: #7227
---

diff --git a/src/output-file.c b/src/output-file.c
index ff8b837394..85af7d3141 100644
--- a/src/output-file.c
+++ b/src/output-file.c
@@ -49,15 +49,12 @@ typedef struct OutputFileLogger_ {
     LoggerId logger_id;
     ThreadInitFunc ThreadInit;
     ThreadDeinitFunc ThreadDeinit;
-    ThreadExitPrintStatsFunc ThreadExitPrintStats;
 } OutputFileLogger;
 
 static OutputFileLogger *list = NULL;
 
 int OutputRegisterFileLogger(LoggerId id, const char *name, FileLogger LogFunc,
-    OutputCtx *output_ctx, ThreadInitFunc ThreadInit,
-    ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats)
+        OutputCtx *output_ctx, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit)
 {
     OutputFileLogger *op = SCCalloc(1, sizeof(*op));
     if (op == NULL)
@@ -69,7 +66,6 @@ int OutputRegisterFileLogger(LoggerId id, const char *name, FileLogger LogFunc,
     op->logger_id = id;
     op->ThreadInit = ThreadInit;
     op->ThreadDeinit = ThreadDeinit;
-    op->ThreadExitPrintStats = ThreadExitPrintStats;
 
     if (list == NULL)
         list = op;
diff --git a/src/output-file.h b/src/output-file.h
index d59d8318b4..8e2a4d7f2a 100644
--- a/src/output-file.h
+++ b/src/output-file.h
@@ -48,9 +48,8 @@ void OutputFileLogFfc(ThreadVars *tv, OutputFileLoggerThreadData *op_thread_data
 typedef int (*FileLogger)(ThreadVars *, void *thread_data, const Packet *, const File *, void *tx,
         const uint64_t tx_id, uint8_t direction);
 
-int OutputRegisterFileLogger(LoggerId id, const char *name, FileLogger LogFunc,
-    OutputCtx *, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats);
+int OutputRegisterFileLogger(LoggerId id, const char *name, FileLogger LogFunc, OutputCtx *,
+        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit);
 
 void OutputFileLoggerRegister(void);
 
diff --git a/src/output-json-file.c b/src/output-json-file.c
index ae8400a18d..509ae488bb 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -352,7 +352,6 @@ static OutputInitResult OutputFileLogInitSub(ConfNode *conf, OutputCtx *parent_c
 void JsonFileLogRegister (void)
 {
     /* register as child of eve-log */
-    OutputRegisterFileSubModule(LOGGER_JSON_FILE, "eve-log", "JsonFileLog",
-        "eve-log.files", OutputFileLogInitSub, JsonFileLogger,
-        JsonFileLogThreadInit, JsonFileLogThreadDeinit, NULL);
+    OutputRegisterFileSubModule(LOGGER_JSON_FILE, "eve-log", "JsonFileLog", "eve-log.files",
+            OutputFileLogInitSub, JsonFileLogger, JsonFileLogThreadInit, JsonFileLogThreadDeinit);
 }
diff --git a/src/output.c b/src/output.c
index f941be7d01..36f23edeca 100644
--- a/src/output.c
+++ b/src/output.c
@@ -391,11 +391,9 @@ void OutputRegisterTxSubModule(LoggerId id, const char *parent_name, const char
  *
  * \retval Returns 0 on success, -1 on failure.
  */
-void OutputRegisterFileSubModule(LoggerId id, const char *parent_name,
-    const char *name, const char *conf_name, OutputInitSubFunc InitFunc,
-    FileLogger FileLogFunc, ThreadInitFunc ThreadInit,
-    ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats)
+void OutputRegisterFileSubModule(LoggerId id, const char *parent_name, const char *name,
+        const char *conf_name, OutputInitSubFunc InitFunc, FileLogger FileLogFunc,
+        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit)
 {
     if (unlikely(FileLogFunc == NULL)) {
         goto error;
@@ -414,7 +412,6 @@ void OutputRegisterFileSubModule(LoggerId id, const char *parent_name,
     module->FileLogFunc = FileLogFunc;
     module->ThreadInit = ThreadInit;
     module->ThreadDeinit = ThreadDeinit;
-    module->ThreadExitPrintStats = ThreadExitPrintStats;
     TAILQ_INSERT_TAIL(&output_modules, module, entries);
 
     SCLogDebug("File logger \"%s\" registered.", name);
diff --git a/src/output.h b/src/output.h
index f85fcfd874..f30e3c37ea 100644
--- a/src/output.h
+++ b/src/output.h
@@ -116,11 +116,9 @@ void OutputRegisterTxSubModuleWithProgress(LoggerId id, const char *parent_name,
         int tc_log_progress, int ts_log_progress, ThreadInitFunc ThreadInit,
         ThreadDeinitFunc ThreadDeinit);
 
-void OutputRegisterFileSubModule(LoggerId id, const char *parent_name,
-    const char *name, const char *conf_name,
-    OutputInitSubFunc InitFunc, FileLogger FileLogFunc,
-    ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats);
+void OutputRegisterFileSubModule(LoggerId id, const char *parent_name, const char *name,
+        const char *conf_name, OutputInitSubFunc InitFunc, FileLogger FileLogFunc,
+        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit);
 
 void OutputRegisterFiledataModule(LoggerId id, const char *name, const char *conf_name,
         OutputInitFunc InitFunc, FiledataLogger FiledataLogFunc, ThreadInitFunc ThreadInit,
diff --git a/src/runmodes.c b/src/runmodes.c
index 048747b074..c55f381de5 100644
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -637,9 +637,8 @@ static void SetupOutput(
         filedata_logger_count++;
     } else if (module->FileLogFunc) {
         SCLogDebug("%s is a file logger", module->name);
-        OutputRegisterFileLogger(module->logger_id, module->name,
-            module->FileLogFunc, output_ctx, module->ThreadInit,
-            module->ThreadDeinit, module->ThreadExitPrintStats);
+        OutputRegisterFileLogger(module->logger_id, module->name, module->FileLogFunc, output_ctx,
+                module->ThreadInit, module->ThreadDeinit);
         file_logger_count++;
     } else if (module->StreamingLogFunc) {
         SCLogDebug("%s is a streaming logger", module->name);