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
pull/11689/head
Jason Ish 6 months ago committed by Victor Julien
parent d4e4ab5736
commit afcf591719

@ -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;

@ -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;

@ -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;

@ -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)

@ -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 */

Loading…
Cancel
Save