From 105ad30a29266eafedd8ef79bc21218b92415907 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 12 Apr 2021 18:30:45 +0200 Subject: Merging upstream version 1.30.1. Signed-off-by: Daniel Baumann --- web/api/formatters/rrd2json.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'web') diff --git a/web/api/formatters/rrd2json.c b/web/api/formatters/rrd2json.c index 5b12c89ba..4344af4ac 100644 --- a/web/api/formatters/rrd2json.c +++ b/web/api/formatters/rrd2json.c @@ -95,12 +95,8 @@ void build_context_param_list(struct context_param **param_list, RRDSET *st) memcpy(rd->state, rd1->state, sizeof(*rd->state)); memcpy(&rd->state->collect_ops, &rd1->state->collect_ops, sizeof(struct rrddim_collect_ops)); memcpy(&rd->state->query_ops, &rd1->state->query_ops, sizeof(struct rrddim_query_ops)); -#ifdef ENABLE_DBENGINE - if (rd->rrd_memory_mode == RRD_MEMORY_MODE_DBENGINE) { - rd->state->metric_uuid = mallocz(sizeof(uuid_t)); - uuid_copy(*rd->state->metric_uuid, *rd1->state->metric_uuid); - } -#endif + rd->state->metric_uuid = mallocz(sizeof(uuid_t)); + uuid_copy(*rd->state->metric_uuid, *rd1->state->metric_uuid); rd->next = (*param_list)->rd; (*param_list)->rd = rd; } -- cgit v1.2.3