output-flow: remove unused initdata argument

The initdata argument to OutputFlowThreadInit was always NULL, remove
it. Internally the ThreadInit functions still get initdata, but this
is the data provided when that logging instance was registered.

Ticket: #7227

diff --git a/src/decode.c b/src/decode.c
index 927791b08b9880de2eabff4420e4deb7f6a20808..0ed546def2251a52b7f89c0bde2567339919078f 100644 (file)
--- a/src/decode.c
+++ b/src/decode.c
@@ -779,7 +779,7 @@ DecodeThreadVars *DecodeThreadVarsAlloc(ThreadVars *tv)
 
     dtv->app_tctx = AppLayerGetCtxThread();
 
-    if (OutputFlowLogThreadInit(tv, NULL, &dtv->output_flow_thread_data) != TM_ECODE_OK) {
+    if (OutputFlowLogThreadInit(tv, &dtv->output_flow_thread_data) != TM_ECODE_OK) {
         SCLogError("initializing flow log API for thread failed");
         DecodeThreadVarsFree(tv, dtv);
         return NULL;

diff --git a/src/flow-manager.c b/src/flow-manager.c
index bc688ed43fdd507f40c7b1d0db9508fc9d82cecc..15abaa40b29fb168140047aced93ed01c3f48571 100644 (file)
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -1021,7 +1021,7 @@ static TmEcode FlowRecyclerThreadInit(ThreadVars *t, const void *initdata, void
     FlowRecyclerThreadData *ftd = SCCalloc(1, sizeof(FlowRecyclerThreadData));
     if (ftd == NULL)
         return TM_ECODE_FAILED;
-    if (OutputFlowLogThreadInit(t, NULL, &ftd->output_thread_data) != TM_ECODE_OK) {
+    if (OutputFlowLogThreadInit(t, &ftd->output_thread_data) != TM_ECODE_OK) {
         SCLogError("initializing flow log API for thread failed");
         SCFree(ftd);
         return TM_ECODE_FAILED;

diff --git a/src/flow-worker.c b/src/flow-worker.c
index 3bb91adf5aa2a61cf98c31506e06ab92b50d1a05..331f6ea7086aac604bb69acbf3d4531ea2ff50db 100644 (file)
--- a/src/flow-worker.c
+++ b/src/flow-worker.c
@@ -289,7 +289,7 @@ static TmEcode FlowWorkerThreadInit(ThreadVars *tv, const void *initdata, void *
         FlowWorkerThreadDeinit(tv, fw);
         return TM_ECODE_FAILED;
     }
-    if (OutputFlowLogThreadInit(tv, NULL, &fw->output_thread_flow) != TM_ECODE_OK) {
+    if (OutputFlowLogThreadInit(tv, &fw->output_thread_flow) != TM_ECODE_OK) {
         SCLogError("initializing flow log API for thread failed");
         FlowWorkerThreadDeinit(tv, fw);
         return TM_ECODE_FAILED;

diff --git a/src/output-flow.c b/src/output-flow.c
index 85a2d7164d655be7fdd05057c1f26150f87f138a..d73815295353ca028270a8dca3f52302bee25071 100644 (file)
--- a/src/output-flow.c
+++ b/src/output-flow.c
@@ -120,7 +120,7 @@ TmEcode OutputFlowLog(ThreadVars *tv, void *thread_data, Flow *f)
 /** \brief thread init for the flow logger
  *  This will run the thread init functions for the individual registered
  *  loggers */
-TmEcode OutputFlowLogThreadInit(ThreadVars *tv, void *initdata, void **data)
+TmEcode OutputFlowLogThreadInit(ThreadVars *tv, void **data)
 {
     OutputFlowLoggerThreadData *td = SCCalloc(1, sizeof(*td));
     if (td == NULL)

diff --git a/src/output-flow.h b/src/output-flow.h
index 6fb7fcbb23e6c7f61ab4874b70f46a377408fb30..86e0e00de007049f12ebc34039962ea1f509c424 100644 (file)
--- a/src/output-flow.h
+++ b/src/output-flow.h
@@ -38,7 +38,7 @@ int OutputRegisterFlowLogger(const char *name, FlowLogger LogFunc,
 void OutputFlowShutdown(void);
 
 TmEcode OutputFlowLog(ThreadVars *tv, void *thread_data, Flow *f);
-TmEcode OutputFlowLogThreadInit(ThreadVars *tv, void *initdata, void **data);
+TmEcode OutputFlowLogThreadInit(ThreadVars *tv, void **data);
 TmEcode OutputFlowLogThreadDeinit(ThreadVars *tv, void *thread_data);
 
 #endif /* SURICATA_OUTPUT_FLOW_H */