output-filedata: remove ThreadExitPrintStats callback

Not used.

Ticket: #7227
pull/11689/head
Jason Ish 1 year ago committed by Victor Julien
parent 16125013db
commit a93bd8a387

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

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

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

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

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

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

Loading…
Cancel
Save