eve/filetype: ThreadDeinit can return void

Change ThreadDeinit to return void instead of an int, there is nothing
to be done on success or failure.
pull/10652/head
Jason Ish 12 months ago committed by Victor Julien
parent cd85d89f14
commit eee9757dba

@ -23,9 +23,6 @@
#define FILETYPE_NAME "json-filetype-plugin"
static int FiletypeThreadInit(void *ctx, ThreadId thread_id, void **thread_data);
static int FiletypeThreadDeinit(void *ctx, void *thread_data);
/**
* Per thread context data for each logging thread.
*/
@ -149,19 +146,18 @@ static int FiletypeThreadInit(void *ctx, ThreadId thread_id, void **thread_data)
* This is where any cleanup per thread should be done including free'ing of the
* thread_data if needed.
*/
static int FiletypeThreadDeinit(void *ctx, void *thread_data)
static void FiletypeThreadDeinit(void *ctx, void *thread_data)
{
SCLogNotice("thread_data=%p", thread_data);
if (thread_data == NULL) {
// Nothing to do.
return 0;
return;
}
ThreadData *tdata = thread_data;
SCLogNotice(
"Deinitializing thread %d: records written: %" PRIu64, tdata->thread_id, tdata->count);
SCFree(tdata);
return 0;
}
/**

@ -54,9 +54,8 @@ static int NullLogThreadInit(void *init_data, ThreadId thread_id, void **thread_
return 0;
}
static int NullLogThreadDeInit(void *init_data, void *thread_data)
static void NullLogThreadDeInit(void *init_data, void *thread_data)
{
return 0;
}
static void NullLogDeInit(void *init_data)

@ -161,10 +161,8 @@ typedef struct SCEveFileType_ {
* \param init_data The data setup in Init
*
* \param thread_data The data setup in ThreadInit
*
* \retval 0 on success, -1 on failure
*/
int (*ThreadDeinit)(void *init_data, void *thread_data);
void (*ThreadDeinit)(void *init_data, void *thread_data);
/* Internal list management. */
TAILQ_ENTRY(SCEveFileType_) entries;

Loading…
Cancel
Save