From a2d7dede737947d7c6afa20a88e1f0c64e0eb96c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 10 Aug 2023 11:18:52 +0200 Subject: Merging upstream version 1.42.0. Signed-off-by: Daniel Baumann --- web/api/formatters/json_wrapper.c | 4 ++-- web/api/formatters/rrd2json.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'web/api/formatters') diff --git a/web/api/formatters/json_wrapper.c b/web/api/formatters/json_wrapper.c index 6a66cbcca..52025c9fc 100644 --- a/web/api/formatters/json_wrapper.c +++ b/web/api/formatters/json_wrapper.c @@ -874,7 +874,7 @@ void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb) { sq[0] = '"'; } - buffer_json_initialize(wb, kq, sq, 0, true, options & RRDR_OPTION_MINIFY); + buffer_json_initialize(wb, kq, sq, 0, true, (options & RRDR_OPTION_MINIFY) ? BUFFER_JSON_OPTIONS_MINIFY : BUFFER_JSON_OPTIONS_DEFAULT); buffer_json_member_add_uint64(wb, "api", 1); buffer_json_member_add_string(wb, "id", qt->id); @@ -1289,7 +1289,7 @@ void rrdr_json_wrapper_begin2(RRDR *r, BUFFER *wb) { sq[0] = '\''; } - buffer_json_initialize(wb, kq, sq, 0, true, options & RRDR_OPTION_MINIFY); + buffer_json_initialize(wb, kq, sq, 0, true, (options & RRDR_OPTION_MINIFY) ? BUFFER_JSON_OPTIONS_MINIFY : BUFFER_JSON_OPTIONS_DEFAULT); buffer_json_member_add_uint64(wb, "api", 2); if(options & RRDR_OPTION_DEBUG) { diff --git a/web/api/formatters/rrd2json.h b/web/api/formatters/rrd2json.h index ca3a41aae..f0c0c39ba 100644 --- a/web/api/formatters/rrd2json.h +++ b/web/api/formatters/rrd2json.h @@ -38,8 +38,6 @@ typedef enum { #define HOSTNAME_MAX 1024 -#define API_RELATIVE_TIME_MAX (3 * 365 * 86400) - #define DATASOURCE_FORMAT_JSON "json" #define DATASOURCE_FORMAT_JSON2 "json2" #define DATASOURCE_FORMAT_DATATABLE_JSON "datatable" -- cgit v1.2.3