X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffrequencies.q;h=5754be7e61e6de277491488c814ba99af96c2057;hb=d594340cb1ae007a92d094ae67116f9f622f2b5d;hp=5cff5892d62dec1cc4e75ad6622b1c81e4412b63;hpb=8cf495e615e4feca5777f3592de98321d4fcdc0b;p=pspp-builds.git diff --git a/src/frequencies.q b/src/frequencies.q index 5cff5892..5754be7e 100644 --- a/src/frequencies.q +++ b/src/frequencies.q @@ -835,8 +835,8 @@ frq_custom_variables (struct cmd_frequencies *cmd UNUSED) { vf->tab.min = min; vf->tab.max = max; - vf->tab.vector = pool_alloc (int_pool, - sizeof (struct freq) * (max - min + 1)); + vf->tab.vector = pool_nalloc (int_pool, + max - min + 1, sizeof *vf->tab.vector); } else vf->tab.vector = NULL; @@ -878,7 +878,7 @@ frq_custom_grouped (struct cmd_frequencies *cmd UNUSED) if (nl >= ml) { ml += 16; - dl = pool_realloc (int_pool, dl, ml * sizeof (double)); + dl = pool_nrealloc (int_pool, dl, ml, sizeof *dl); } dl[nl++] = tokval; lex_get (); @@ -949,9 +949,8 @@ add_percentile (double x) if (i >= n_percentiles || tokval != percentiles[i].p) { - percentiles - = pool_realloc (int_pool, percentiles, - (n_percentiles + 1) * sizeof (struct percentile )); + percentiles = pool_nrealloc (int_pool, percentiles, + n_percentiles + 1, sizeof *percentiles); if (i < n_percentiles) memmove (&percentiles[i + 1], &percentiles[i],