From 4c02602344017800b5864d833d0cbdf8f52874cd Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 6 Nov 2018 15:13:01 +0100 Subject: [PATCH] log_logstash plugin: Fix non-portable struct initialization with "{}". --- src/log_logstash.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/log_logstash.c b/src/log_logstash.c index 8df43136..6ebab3be 100644 --- a/src/log_logstash.c +++ b/src/log_logstash.c @@ -183,22 +183,14 @@ err: static void log_logstash_log(int severity, const char *msg, user_data_t __attribute__((unused)) * user_data) { - yajl_gen g; -#if !defined(HAVE_YAJL_V2) - yajl_gen_config conf = {}; - - conf.beautify = 0; -#endif - if (severity > log_level) return; #if HAVE_YAJL_V2 - g = yajl_gen_alloc(NULL); + yajl_gen g = yajl_gen_alloc(NULL); #else - g = yajl_gen_alloc(&conf, NULL); + yajl_gen g = yajl_gen_alloc(&(yajl_gen_config){0}, NULL); #endif - if (g == NULL) { fprintf(stderr, "Could not allocate JSON generator.\n"); return; -- 2.11.0