From 223d9a1e3ad223987c56801101223ab179e74931 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Mon, 11 Dec 2017 15:31:58 -0600 Subject: [PATCH] eve: remove json format option - was not used --- src/output-json.c | 13 ------------- src/output-json.h | 3 --- 2 files changed, 16 deletions(-) diff --git a/src/output-json.c b/src/output-json.c index ecd26ee5d6..05942a581e 100644 --- a/src/output-json.c +++ b/src/output-json.c @@ -640,19 +640,6 @@ OutputCtx *OutputJsonInitCtx(ConfNode *conf) return NULL; } OutputRegisterFileRotationFlag(&json_ctx->file_ctx->rotation_flag); - - const char *format_s = ConfNodeLookupChildValue(conf, "format"); - if (format_s != NULL) { - if (strcmp(format_s, "indent") == 0) { - json_ctx->format = INDENT; - } else if (strcmp(format_s, "compact") == 0) { - json_ctx->format = COMPACT; - } else { - SCLogError(SC_ERR_INVALID_ARGUMENT, - "Invalid JSON format option: %s", format_s); - exit(EXIT_FAILURE); - } - } } else if (json_ctx->json_out == LOGFILE_TYPE_SYSLOG) { const char *facility_s = ConfNodeLookupChildValue(conf, "facility"); if (facility_s == NULL) { diff --git a/src/output-json.h b/src/output-json.h index fcd98538c2..76d4f02848 100644 --- a/src/output-json.h +++ b/src/output-json.h @@ -48,15 +48,12 @@ json_t *CreateJSONHeaderWithTxId(const Packet *p, int direction_sensitive, const int OutputJSONBuffer(json_t *js, LogFileCtx *file_ctx, MemBuffer **buffer); OutputCtx *OutputJsonInitCtx(ConfNode *); -enum JsonFormat { COMPACT, INDENT }; - /* * Global configuration context data */ typedef struct OutputJsonCtx_ { LogFileCtx *file_ctx; enum LogFileType json_out; - enum JsonFormat format; } OutputJsonCtx; json_t *SCJsonBool(int val);