Merging upstream version 1.36.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/web/api/queries/average/average.c b/web/api/queries/average/average.c
index 2ed33da50..0719d57fa 100644
--- a/web/api/queries/average/average.c
+++ b/web/api/queries/average/average.c
@@ -6,12 +6,12 @@
 // average
 
 struct grouping_average {
-    calculated_number sum;
+    NETDATA_DOUBLE sum;
     size_t count;
 };
 
-void grouping_create_average(RRDR *r) {
-    r->internal.grouping_data = callocz(1, sizeof(struct grouping_average));
+void grouping_create_average(RRDR *r, const char *options __maybe_unused) {
+    r->internal.grouping_data = onewayalloc_callocz(r->internal.owa, 1, sizeof(struct grouping_average));
 }
 
 // resets when switches dimensions
@@ -23,20 +23,20 @@ void grouping_reset_average(RRDR *r) {
 }
 
 void grouping_free_average(RRDR *r) {
-    freez(r->internal.grouping_data);
+    onewayalloc_freez(r->internal.owa, r->internal.grouping_data);
     r->internal.grouping_data = NULL;
 }
 
-void grouping_add_average(RRDR *r, calculated_number value) {
+void grouping_add_average(RRDR *r, NETDATA_DOUBLE value) {
     struct grouping_average *g = (struct grouping_average *)r->internal.grouping_data;
     g->sum += value;
     g->count++;
 }
 
-calculated_number grouping_flush_average(RRDR *r,  RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
+NETDATA_DOUBLE grouping_flush_average(RRDR *r,  RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
     struct grouping_average *g = (struct grouping_average *)r->internal.grouping_data;
 
-    calculated_number value;
+    NETDATA_DOUBLE value;
 
     if(unlikely(!g->count)) {
         value = 0.0;