From d14a14fa1371ac36510cd24748a2ee65f6b73497 Mon Sep 17 00:00:00 2001 From: Jeff Lucovsky Date: Fri, 12 Jun 2020 10:13:10 -0400 Subject: [PATCH] output/anomaly: Use helpers for string output --- src/output-json-anomaly.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/output-json-anomaly.c b/src/output-json-anomaly.c index e9980446b3..3f2fec40cb 100644 --- a/src/output-json-anomaly.c +++ b/src/output-json-anomaly.c @@ -115,12 +115,14 @@ static int AnomalyDecodeEventJson(ThreadVars *tv, JsonAnomalyLogThread *aft, if (event_code < DECODE_EVENT_MAX) { const char *event = DEvents[event_code].event_name; - jb_set_string(js, "type", - EVENT_IS_DECODER_PACKET_ERROR(event_code) ? - "decode" : "stream"); + if (EVENT_IS_DECODER_PACKET_ERROR(event_code)) { + JB_SET_STRING(js, "type", "decode"); + } else { + JB_SET_STRING(js, "type", "stream"); + } jb_set_string(js, "event", event); } else { - jb_set_string(js, "type", "unknown"); + JB_SET_STRING(js, "type", "unknown"); jb_set_uint(js, "code", event_code); } @@ -180,10 +182,10 @@ static int AnomalyAppLayerDecoderEventJson(JsonAnomalyLogThread *aft, event_code, &event_name, &event_type); } if (r == 0) { - jb_set_string(js, "type", "applayer"); + JB_SET_STRING(js, "type", "applayer"); jb_set_string(js, "event", event_name); } else { - jb_set_string(js, "type", "unknown"); + JB_SET_STRING(js, "type", "unknown"); jb_set_uint(js, "code", event_code); } -- 2.47.2