subcase: Rename subcase_destroy() to subcase_uninit().

[pspp] / src / language / stats / aggregate.c

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index 9815f1e25adb1062dacd2c0e1220087abf245762..640746991c3246209c56efae14df3302d8fccfd9 100644 (file)
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -708,7 +708,7 @@ agr_destroy (struct agr_proc *agr)
 {
   struct agr_var *iter, *next;
 
-  subcase_destroy (&agr->sort);
+  subcase_uninit (&agr->sort);
   free (agr->break_vars);
   for (iter = agr->agr_vars; iter; iter = next)
     {
@@ -754,7 +754,7 @@ accumulate_aggregate_info (struct agr_proc *agr, const struct ccase *input)
        const union value *v = case_data (input, iter->src);
         int src_width = var_get_width (iter->src);
 
-        if (var_is_value_missing (iter->src, v, iter->exclude))
+        if (var_is_value_missing (iter->src, v) & iter->exclude)
          {
            switch (iter->function)
              {
@@ -1119,7 +1119,7 @@ initialize_aggregate_info (struct agr_proc *agr)
 
             subcase_init_var (&ordering, iter->subject, SC_ASCEND);
            iter->writer = sort_create_writer (&ordering, proto);
-            subcase_destroy (&ordering);
+            subcase_uninit (&ordering);
             caseproto_unref (proto);
 
            iter->cc = 0;