output-json: cleanup, have OutputJsonBuilderBuffer return void

The return value was never used.
pull/12178/head
Jason Ish 8 months ago committed by Victor Julien
parent d39e42728a
commit 2e2eaac0b2

@ -955,7 +955,7 @@ int OutputJSONBuffer(json_t *js, LogFileCtx *file_ctx, MemBuffer **buffer)
return 0; return 0;
} }
int OutputJsonBuilderBuffer( void OutputJsonBuilderBuffer(
ThreadVars *tv, const Packet *p, Flow *f, JsonBuilder *js, OutputJsonThreadCtx *ctx) ThreadVars *tv, const Packet *p, Flow *f, JsonBuilder *js, OutputJsonThreadCtx *ctx)
{ {
LogFileCtx *file_ctx = ctx->file_ctx; LogFileCtx *file_ctx = ctx->file_ctx;
@ -994,14 +994,12 @@ int OutputJsonBuilderBuffer(
SCLogWarning("Formatted JSON EVE record too large, will be dropped: %s", partial); SCLogWarning("Formatted JSON EVE record too large, will be dropped: %s", partial);
ctx->too_large_warning = true; ctx->too_large_warning = true;
} }
return 0; return;
} }
} }
MemBufferWriteRaw((*buffer), jb_ptr(js), (uint32_t)jslen); MemBufferWriteRaw((*buffer), jb_ptr(js), (uint32_t)jslen);
LogFileWrite(file_ctx, *buffer); LogFileWrite(file_ctx, *buffer);
return 0;
} }
static inline enum LogFileType FileTypeFromConf(const char *typestr) static inline enum LogFileType FileTypeFromConf(const char *typestr)

@ -104,7 +104,7 @@ JsonBuilder *CreateEveHeader(const Packet *p, enum OutputJsonLogDirection dir,
JsonBuilder *CreateEveHeaderWithTxId(const Packet *p, enum OutputJsonLogDirection dir, JsonBuilder *CreateEveHeaderWithTxId(const Packet *p, enum OutputJsonLogDirection dir,
const char *event_type, JsonAddrInfo *addr, uint64_t tx_id, OutputJsonCtx *eve_ctx); const char *event_type, JsonAddrInfo *addr, uint64_t tx_id, OutputJsonCtx *eve_ctx);
int OutputJSONBuffer(json_t *js, LogFileCtx *file_ctx, MemBuffer **buffer); int OutputJSONBuffer(json_t *js, LogFileCtx *file_ctx, MemBuffer **buffer);
int OutputJsonBuilderBuffer( void OutputJsonBuilderBuffer(
ThreadVars *tv, const Packet *p, Flow *f, JsonBuilder *js, OutputJsonThreadCtx *ctx); ThreadVars *tv, const Packet *p, Flow *f, JsonBuilder *js, OutputJsonThreadCtx *ctx);
OutputInitResult OutputJsonInitCtx(ConfNode *); OutputInitResult OutputJsonInitCtx(ConfNode *);

Loading…
Cancel
Save