X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasegrouper.c;h=d4993b4952ff9e874a0388a478aa4c941b9b9231;hb=3640237a5fc890a84cb814fbe8bf6fd9299624e4;hp=eb8d65deee739b7d9e7269844e490bd3329d5ca9;hpb=3dd0f6ae0d5eb73a2270a243e443c4ae03c2c16e;p=pspp

diff --git a/src/data/casegrouper.c b/src/data/casegrouper.c
index eb8d65deee..d4993b4952 100644
--- a/src/data/casegrouper.c
+++ b/src/data/casegrouper.c
@@ -168,19 +168,19 @@ 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);
     }
@@ -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
@@ -242,7 +242,7 @@ casegrouper_vars_destroy (void *sc_)
   struct subcase *sc = sc_;
   if (sc != NULL)
     {
-      subcase_destroy (sc);
+      subcase_uninit (sc);
       free (sc);
     }
 }