X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fmeans.c;h=888a6a75836707f71564816ab6a15da2b8db8835;hb=4c5964204338f984c093f7905ce491ad8923e910;hp=c048161ca1bfda424298884664d45e2edc8e8639;hpb=e0bcf133ab9091a2fa5227d2767651d8ec58caef;p=pspp diff --git a/src/language/stats/means.c b/src/language/stats/means.c index c048161ca1..888a6a7583 100644 --- a/src/language/stats/means.c +++ b/src/language/stats/means.c @@ -827,6 +827,22 @@ struct per_cat_data bool warn; }; + +static void +destroy_n (const void *aux1 UNUSED, void *aux2, void *user_data) +{ + struct mtable *table = aux2; + int v; + struct per_cat_data *per_cat_data = user_data; + struct per_var_data *pvd = per_cat_data->pvd; + + for (v = 0; v < table->n_dep_vars; ++v) + { + struct per_var_data *pp = &pvd[v]; + moments1_destroy (pp->mom); + } +} + static void * create_n (const void *aux1, void *aux2) { @@ -939,6 +955,7 @@ run_means (struct means *cmd, struct casereader *input, payload.create = create_n; payload.update = update_n; payload.calculate = calculate_n; + payload.destroy = destroy_n; for (t = 0; t < cmd->n_tables; ++t) { @@ -950,7 +967,7 @@ run_means (struct means *cmd, struct casereader *input, categoricals_set_payload (table->cats, &payload, cmd, table); } - for (reader = casereader_clone (input); + for (reader = input; (c = casereader_read (reader)) != NULL; case_unref (c)) { for (t = 0; t < cmd->n_tables; ++t)