eve: fix context datatype used in init functions

Many were using AlertJsonThread instead of OutputJsonCtx,
but as the datatypes were similar enough no harm was done.

Now that they are using their proper datatype, removed
AlertJsonThread from output.h as its no longer used.
pull/3112/head
Jason Ish 7 years ago committed by Victor Julien
parent b005cceb0a
commit c4d30ddaf9

@ -364,7 +364,7 @@ static void OutputDNP3LogDeInitCtxSub(OutputCtx *output_ctx)
static OutputCtx *OutputDNP3LogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
{
AlertJsonThread *ajt = parent_ctx->data;
OutputJsonCtx *ajt = parent_ctx->data;
LogDNP3FileCtx *dnp3log_ctx = SCCalloc(1, sizeof(*dnp3log_ctx));
if (unlikely(dnp3log_ctx == NULL)) {

@ -312,7 +312,7 @@ static OutputCtx *JsonDropLogInitCtxSub(ConfNode *conf, OutputCtx *parent_ctx)
return NULL;
}
AlertJsonThread *ajt = parent_ctx->data;
OutputJsonCtx *ajt = parent_ctx->data;
JsonDropOutputCtx *drop_ctx = SCCalloc(1, sizeof(*drop_ctx));
if (drop_ctx == NULL)

@ -136,7 +136,7 @@ static void OutputNFSLogDeInitCtxSub(OutputCtx *output_ctx)
static OutputCtx *OutputNFSLogInitSub(ConfNode *conf,
OutputCtx *parent_ctx)
{
AlertJsonThread *ajt = parent_ctx->data;
OutputJsonCtx *ajt = parent_ctx->data;
LogNFSFileCtx *nfslog_ctx = SCCalloc(1, sizeof(*nfslog_ctx));
if (unlikely(nfslog_ctx == NULL)) {

@ -440,7 +440,7 @@ static void OutputStatsLogDeinitSub(OutputCtx *output_ctx)
static OutputCtx *OutputStatsLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
{
AlertJsonThread *ajt = parent_ctx->data;
OutputJsonCtx *ajt = parent_ctx->data;
OutputStatsCtx *stats_ctx = SCMalloc(sizeof(OutputStatsCtx));
if (unlikely(stats_ctx == NULL))

@ -125,7 +125,7 @@ static void OutputTemplateLogDeInitCtxSub(OutputCtx *output_ctx)
static OutputCtx *OutputTemplateLogInitSub(ConfNode *conf,
OutputCtx *parent_ctx)
{
AlertJsonThread *ajt = parent_ctx->data;
OutputJsonCtx *ajt = parent_ctx->data;
LogTemplateFileCtx *templatelog_ctx = SCCalloc(1, sizeof(*templatelog_ctx));
if (unlikely(templatelog_ctx == NULL)) {

@ -59,11 +59,6 @@ typedef struct OutputJsonCtx_ {
enum JsonFormat format;
} OutputJsonCtx;
typedef struct AlertJsonThread_ {
/** LogFileCtx has the pointer to the file and a mutex to allow multithreading */
LogFileCtx *file_ctx;
} AlertJsonThread;
json_t *SCJsonBool(int val);
#endif /* HAVE_LIBJANSSON */

Loading…
Cancel
Save