subcase: Rename subcase_destroy() to subcase_uninit().

[pspp] / src / data / casegrouper.c

diff --git a/src/data/casegrouper.c b/src/data/casegrouper.c
index 48560bb6a5614766edfab0d345e15e0bc6027e9e..d4993b4952ff9e874a0388a478aa4c941b9b9231 100644 (file)
--- a/src/data/casegrouper.c
+++ b/src/data/casegrouper.c
@@ -168,21 +168,21 @@ static void casegrouper_vars_destroy (void *);
 
 /* Creates and returns a casegrouper that reads data from READER
    and breaks it into contiguous groups of cases that have equal
-   values for the VAR_CNT variables in VARS.  If VAR_CNT is 0,
+   values for the N_VARS variables in VARS.  If N_VARS is 0,
    then all the cases will be put in a single group.
 
    Takes ownerhip of READER. */
 struct casegrouper *
 casegrouper_create_vars (struct casereader *reader,
                          const struct variable *const *vars,
-                         size_t var_cnt)
+                         size_t n_vars)
 {
-  if (var_cnt > 0) 
+  if (n_vars > 0)
     {
       struct subcase *sc = xmalloc (sizeof *sc);
-      subcase_init_vars (sc, vars, var_cnt);
+      subcase_init_vars (sc, vars, n_vars);
       return casegrouper_create_func (reader, casegrouper_vars_same_group,
-                                      casegrouper_vars_destroy, sc); 
+                                      casegrouper_vars_destroy, sc);
     }
   else
     return casegrouper_create_func (reader, NULL, NULL, NULL);
@@ -201,7 +201,7 @@ casegrouper_create_splits (struct casereader *reader,
 {
   return casegrouper_create_vars (reader,
                                   dict_get_split_vars (dict),
-                                  dict_get_split_cnt (dict));
+                                  dict_get_n_splits (dict));
 }
 
 /* Creates and returns a casegrouper that reads data from READER
@@ -215,12 +215,12 @@ struct casegrouper *
 casegrouper_create_subcase (struct casereader *reader,
                             const struct subcase *sc)
 {
-  if (subcase_get_n_fields (sc) > 0) 
+  if (subcase_get_n_fields (sc) > 0)
     {
       struct subcase *sc_copy = xmalloc (sizeof *sc);
       subcase_clone (sc_copy, sc);
       return casegrouper_create_func (reader, casegrouper_vars_same_group,
-                                      casegrouper_vars_destroy, sc_copy); 
+                                      casegrouper_vars_destroy, sc_copy);
     }
   else
     return casegrouper_create_func (reader, NULL, NULL, NULL);
@@ -240,9 +240,9 @@ static void
 casegrouper_vars_destroy (void *sc_)
 {
   struct subcase *sc = sc_;
-  if (sc != NULL) 
+  if (sc != NULL)
     {
-      subcase_destroy (sc);
-      free (sc); 
+      subcase_uninit (sc);
+      free (sc);
     }
 }