From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 4 Aug 2012 05:04:47 +0000 (+0200)
Subject: categoricals.c (struct payload): Rename destroy to calculate
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0bcf133ab9091a2fa5227d2767651d8ec58caef;p=pspp

categoricals.c (struct payload): Rename destroy to calculate
---

diff --git a/src/language/stats/examine.c b/src/language/stats/examine.c
index fc67ffaf2a..4e4790eb32 100644
--- a/src/language/stats/examine.c
+++ b/src/language/stats/examine.c
@@ -1803,7 +1803,7 @@ run_examine (struct examine *cmd, struct casereader *input)
   struct payload payload;
   payload.create = create_n;
   payload.update = update_n;
-  payload.destroy = calculate_n;
+  payload.calculate = calculate_n;
   
   cmd->wv = dict_get_weight (cmd->dict);
 
diff --git a/src/language/stats/means.c b/src/language/stats/means.c
index f5e03c16f1..c048161ca1 100644
--- a/src/language/stats/means.c
+++ b/src/language/stats/means.c
@@ -938,7 +938,7 @@ run_means (struct means *cmd, struct casereader *input,
   struct payload payload;
   payload.create = create_n;
   payload.update = update_n;
-  payload.destroy = calculate_n;
+  payload.calculate = calculate_n;
   
   for (t = 0; t < cmd->n_tables; ++t)
   {
diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index 4fd027e299..08449103c5 100644
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -690,7 +690,7 @@ run_oneway (const struct oneway_spec *cmd,
       struct payload payload;
       payload.create = makeit;
       payload.update = updateit;
-      payload.destroy = NULL;
+      payload.calculate = NULL;
 
       ws.vws[v].cat = categoricals_create (&inter, 1, cmd->wv,
                                            cmd->exclude, cmd->exclude);
diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index ba88227864..2bc2b626b0 100644
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -591,8 +591,8 @@ categoricals_done (const struct categoricals *cat_)
 	      const double bin = categoricals_get_code_for_case (cat, x, iv->ccase); \
 	      iap->enc_sum [x - iap->base_subscript_short] += bin * iv->cc;
 	    }
-	  if (cat->payload && cat->payload->destroy)
-	    cat->payload->destroy (cat->aux1, cat->aux2, iv->user_data);
+	  if (cat->payload && cat->payload->calculate)
+	    cat->payload->calculate (cat->aux1, cat->aux2, iv->user_data);
 	}
     }
 
diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index 28e0f5f1df..11d64d0229 100644
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -106,7 +106,7 @@ struct payload
 {
   void* (*create)  (const void *aux1, void *aux2);
   void (*update)  (const void *aux1, void *aux2, void *user_data, const struct ccase *, double weight);
-  void (*destroy) (const void *aux1, void *aux2, void *user_data);
+  void (*calculate) (const void *aux1, void *aux2, void *user_data);
 };