MonetDB: default - Initialize dbl with constant 0 instead of mem...

[Pedro Ferreira]

Changeset: 8976676d6c81 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8976676d6c81
Modified Files:
        gdk/gdk_aggr.c
Branch: default
Log Message:

Initialize dbl with constant 0 instead of memset for greater portability


diffs (57 lines):

diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3595,14 +3595,20 @@ dogroupcovariance(BAT *b1, BAT *b2, BAT 
 
        delta1 = GDKmalloc(ngrp * sizeof(dbl));
        delta2 = GDKmalloc(ngrp * sizeof(dbl));
-       m2 = GDKzalloc(ngrp * sizeof(dbl));
+       m2 = GDKmalloc(ngrp * sizeof(dbl));
        cnts = GDKzalloc(ngrp * sizeof(BUN));
-       mean1 = GDKzalloc(ngrp * sizeof(dbl));
-       mean2 = GDKzalloc(ngrp * sizeof(dbl));
+       mean1 = GDKmalloc(ngrp * sizeof(dbl));
+       mean2 = GDKmalloc(ngrp * sizeof(dbl));
 
        if (mean1 == NULL || mean2 == NULL || delta1 == NULL || delta2 == NULL 
|| m2 == NULL || cnts == NULL)
                goto alloc_fail;
 
+       for (i = 0; i < ngrp; i++) {
+               m2[i] = 0;
+               mean1[i] = 0;
+               mean2[i] = 0;
+       }
+
        bn = COLnew(min, TYPE_dbl, ngrp, TRANSIENT);
        if (bn == NULL)
                goto alloc_fail;
@@ -3767,16 +3773,24 @@ BATgroupcorrelation(BAT *b1, BAT *b2, BA
 
        delta1 = GDKmalloc(ngrp * sizeof(dbl));
        delta2 = GDKmalloc(ngrp * sizeof(dbl));
-       up = GDKzalloc(ngrp * sizeof(dbl));
-       down1 = GDKzalloc(ngrp * sizeof(dbl));
-       down2 = GDKzalloc(ngrp * sizeof(dbl));
+       up = GDKmalloc(ngrp * sizeof(dbl));
+       down1 = GDKmalloc(ngrp * sizeof(dbl));
+       down2 = GDKmalloc(ngrp * sizeof(dbl));
        cnts = GDKzalloc(ngrp * sizeof(BUN));
-       mean1 = GDKzalloc(ngrp * sizeof(dbl));
-       mean2 = GDKzalloc(ngrp * sizeof(dbl));
+       mean1 = GDKmalloc(ngrp * sizeof(dbl));
+       mean2 = GDKmalloc(ngrp * sizeof(dbl));
 
        if (mean1 == NULL || mean2 == NULL || delta1 == NULL || delta2 == NULL 
|| up == NULL || down1 == NULL || down2 == NULL || cnts == NULL)
                goto alloc_fail;
 
+       for (i = 0; i < ngrp; i++) {
+               up[i] = 0;
+               down1[i] = 0;
+               down2[i] = 0;
+               mean1[i] = 0;
+               mean2[i] = 0;
+       }
+
        bn = COLnew(min, TYPE_dbl, ngrp, TRANSIENT);
        if (bn == NULL)
                goto alloc_fail;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list