From 7877a98bd9c00db5e81dd2f8c734cba2bab20be7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 12 Aug 2022 09:26:17 +0200
Subject: Merging upstream version 1.36.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 web/api/queries/sum/sum.c | 14 +++++++-------
 web/api/queries/sum/sum.h |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'web/api/queries/sum')

diff --git a/web/api/queries/sum/sum.c b/web/api/queries/sum/sum.c
index 6bb012bb0..eec6e2ad0 100644
--- a/web/api/queries/sum/sum.c
+++ b/web/api/queries/sum/sum.c
@@ -6,12 +6,12 @@
 // sum
 
 struct grouping_sum {
-    calculated_number sum;
+    NETDATA_DOUBLE sum;
     size_t count;
 };
 
-void grouping_create_sum(RRDR *r) {
-    r->internal.grouping_data = callocz(1, sizeof(struct grouping_sum));
+void grouping_create_sum(RRDR *r, const char *options __maybe_unused) {
+    r->internal.grouping_data = onewayalloc_callocz(r->internal.owa, 1, sizeof(struct grouping_sum));
 }
 
 // resets when switches dimensions
@@ -23,20 +23,20 @@ void grouping_reset_sum(RRDR *r) {
 }
 
 void grouping_free_sum(RRDR *r) {
-    freez(r->internal.grouping_data);
+    onewayalloc_freez(r->internal.owa, r->internal.grouping_data);
     r->internal.grouping_data = NULL;
 }
 
-void grouping_add_sum(RRDR *r, calculated_number value) {
+void grouping_add_sum(RRDR *r, NETDATA_DOUBLE value) {
     struct grouping_sum *g = (struct grouping_sum *)r->internal.grouping_data;
     g->sum += value;
     g->count++;
 }
 
-calculated_number grouping_flush_sum(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
+NETDATA_DOUBLE grouping_flush_sum(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
     struct grouping_sum *g = (struct grouping_sum *)r->internal.grouping_data;
 
-    calculated_number value;
+    NETDATA_DOUBLE value;
 
     if(unlikely(!g->count)) {
         value = 0.0;
diff --git a/web/api/queries/sum/sum.h b/web/api/queries/sum/sum.h
index 05cb6185e..4e7e396e9 100644
--- a/web/api/queries/sum/sum.h
+++ b/web/api/queries/sum/sum.h
@@ -6,10 +6,10 @@
 #include "../query.h"
 #include "../rrdr.h"
 
-extern void grouping_create_sum(RRDR *r);
+extern void grouping_create_sum(RRDR *r, const char *options __maybe_unused);
 extern void grouping_reset_sum(RRDR *r);
 extern void grouping_free_sum(RRDR *r);
-extern void grouping_add_sum(RRDR *r, calculated_number value);
-extern calculated_number grouping_flush_sum(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr);
+extern void grouping_add_sum(RRDR *r, NETDATA_DOUBLE value);
+extern NETDATA_DOUBLE grouping_flush_sum(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr);
 
 #endif //NETDATA_API_QUERY_SUM_H
-- 
cgit v1.2.3