output-json: cleanup, have OutputJsonBuilderBuffer return void

The return value was never used.

diff --git a/src/output-json.c b/src/output-json.c
index 4b42b6802d0565f92394c13cc994523fce9f35e5..2880a25d87f91eb655a5bd152480c1ec4aeda86b 100644 (file)
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -955,7 +955,7 @@ int OutputJSONBuffer(json_t *js, LogFileCtx *file_ctx, MemBuffer **buffer)
     return 0;
 }
 
-int OutputJsonBuilderBuffer(
+void OutputJsonBuilderBuffer(
         ThreadVars *tv, const Packet *p, Flow *f, JsonBuilder *js, OutputJsonThreadCtx *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);
                 ctx->too_large_warning = true;
             }
-            return 0;
+            return;
         }
     }
 
     MemBufferWriteRaw((*buffer), jb_ptr(js), (uint32_t)jslen);
     LogFileWrite(file_ctx, *buffer);
-
-    return 0;
 }
 
 static inline enum LogFileType FileTypeFromConf(const char *typestr)

diff --git a/src/output-json.h b/src/output-json.h
index 205ed445d4d6720bb7f62cb6e2b41fcacc7cab6b..b8c11778ed272c8c58e3e3209180c111b5353a61 100644 (file)
--- a/src/output-json.h
+++ b/src/output-json.h
@@ -104,7 +104,7 @@ JsonBuilder *CreateEveHeader(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);
 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);
 OutputInitResult OutputJsonInitCtx(ConfNode *);