From 89f3604407aff8f4cb2ed958252c61e23c767e24 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 9 Jun 2022 06:52:39 +0200 Subject: Adding upstream version 1.35.0. Signed-off-by: Daniel Baumann --- web/api/queries/median/median.c | 10 ++++------ web/api/queries/median/median.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'web/api/queries/median') diff --git a/web/api/queries/median/median.c b/web/api/queries/median/median.c index 31916c546..bffcee12f 100644 --- a/web/api/queries/median/median.c +++ b/web/api/queries/median/median.c @@ -13,14 +13,14 @@ struct grouping_median { LONG_DOUBLE series[]; }; -void *grouping_create_median(RRDR *r) { +void grouping_create_median(RRDR *r) { long entries = r->group; if(entries < 0) entries = 0; struct grouping_median *g = (struct grouping_median *)callocz(1, sizeof(struct grouping_median) + entries * sizeof(LONG_DOUBLE)); g->series_size = (size_t)entries; - return g; + r->internal.grouping_data = g; } // resets when switches dimensions @@ -41,10 +41,8 @@ void grouping_add_median(RRDR *r, calculated_number value) { if(unlikely(g->next_pos >= g->series_size)) { error("INTERNAL ERROR: median buffer overflow on chart '%s' - next_pos = %zu, series_size = %zu, r->group = %ld.", r->st->name, g->next_pos, g->series_size, r->group); } - else { - if(calculated_number_isnumber(value)) - g->series[g->next_pos++] = (LONG_DOUBLE)value; - } + else + g->series[g->next_pos++] = (LONG_DOUBLE)value; } calculated_number grouping_flush_median(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr) { diff --git a/web/api/queries/median/median.h b/web/api/queries/median/median.h index dd2c1ffc5..28d52b31e 100644 --- a/web/api/queries/median/median.h +++ b/web/api/queries/median/median.h @@ -6,7 +6,7 @@ #include "../query.h" #include "../rrdr.h" -extern void *grouping_create_median(RRDR *r); +extern void grouping_create_median(RRDR *r); extern void grouping_reset_median(RRDR *r); extern void grouping_free_median(RRDR *r); extern void grouping_add_median(RRDR *r, calculated_number value); -- cgit v1.2.3