From 53704ea46842d850d6236495b1f448df0f483f58 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 1 Mar 2016 17:31:33 +0100 Subject: [PATCH] output-json: constify API --- src/output-json.c | 6 ++++-- src/output-json.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/output-json.c b/src/output-json.c index 89311bdd92..658ac473d7 100644 --- a/src/output-json.c +++ b/src/output-json.c @@ -175,7 +175,8 @@ void CreateJSONFlowId(json_t *js, const Flow *f) json_object_set_new(js, "flow_id", json_integer(addr)); } -json_t *CreateJSONHeader(Packet *p, int direction_sensitive, char *event_type) +json_t *CreateJSONHeader(const Packet *p, int direction_sensitive, + const char *event_type) { char timebuf[64]; char srcip[46], dstip[46]; @@ -321,7 +322,8 @@ json_t *CreateJSONHeader(Packet *p, int direction_sensitive, char *event_type) return js; } -json_t *CreateJSONHeaderWithTxId(Packet *p, int direction_sensitive, char *event_type, uint32_t tx_id) +json_t *CreateJSONHeaderWithTxId(const Packet *p, int direction_sensitive, + const char *event_type, uint64_t tx_id) { json_t *js = CreateJSONHeader(p, direction_sensitive, event_type); if (unlikely(js == NULL)) diff --git a/src/output-json.h b/src/output-json.h index d6b16fd641..467062db33 100644 --- a/src/output-json.h +++ b/src/output-json.h @@ -41,8 +41,8 @@ int OutputJSONMemBufferCallback(const char *str, size_t size, void *data); void CreateJSONFlowId(json_t *js, const Flow *f); void JsonTcpFlags(uint8_t flags, json_t *js); -json_t *CreateJSONHeader(Packet *p, int direction_sensative, char *event_type); -json_t *CreateJSONHeaderWithTxId(Packet *p, int direction_sensitive, char *event_type, uint32_t tx_id); +json_t *CreateJSONHeader(const Packet *p, int direction_sensative, const char *event_type); +json_t *CreateJSONHeaderWithTxId(const Packet *p, int direction_sensitive, const char *event_type, uint64_t tx_id); TmEcode OutputJSON(json_t *js, void *data, uint64_t *count); int OutputJSONBuffer(json_t *js, LogFileCtx *file_ctx, MemBuffer **buffer); OutputCtx *OutputJsonInitCtx(ConfNode *); -- 2.47.2