Delete trailing whitespace at end of lines.

[pspp-builds.git] / src / language / stats / means.q

diff --git a/src/language/stats/means.q b/src/language/stats/means.q
index b952df19a4e084260f9b76a57e8036125b9886ce..e10d90145bce413ce0913607382a662271840796 100644 (file)
--- a/src/language/stats/means.q
+++ b/src/language/stats/means.q
@@ -53,7 +53,7 @@
 /* TABLES: Variable lists for each dimension. */
 static int n_dim;              /* Number of dimensions. */
 static size_t *nv_dim;         /* Number of variables in each dimension. */
-static struct variable ***v_dim;       /* Variables in each dimension.  */
+static const struct variable ***v_dim; /* Variables in each dimension.  */
 
 /* VARIABLES: List of variables. */
 static struct variable **v_var;
@@ -64,7 +64,7 @@ cmd_means (struct lexer *lexer, struct dataset *ds)
 {
   struct cmd_means cmd;
   int success = CMD_FAILURE;
-  
+
   n_dim = 0;
   nv_dim = NULL;
   v_dim = NULL;
@@ -108,14 +108,14 @@ cmd_means (struct lexer *lexer, struct dataset *ds)
 free:
   {
     int i;
-    
+
     for (i = 0; i < n_dim; i++)
       free (v_dim[i]);
     free (nv_dim);
     free (v_dim);
     free (v_var);
   }
-  
+
   return success;
 }
 
@@ -123,8 +123,8 @@ free:
 static int
 mns_custom_tables (struct lexer *lexer, struct dataset *ds, struct cmd_means *cmd, void *aux UNUSED)
 {
-  struct var_set *var_set;
-  
+  struct const_var_set *var_set;
+
   if (!lex_match_id (lexer, "TABLES")
       && (lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL)
       && lex_token (lexer) != T_ALL)
@@ -138,18 +138,18 @@ mns_custom_tables (struct lexer *lexer, struct dataset *ds, struct cmd_means *cm
       return 0;
     }
 
-  var_set = var_set_create_from_dict (dataset_dict (ds));
+  var_set = const_var_set_create_from_dict (dataset_dict (ds));
   assert (var_set != NULL);
 
   do
     {
       size_t nvl;
-      struct variable **vl;
+      const struct variable **vl;
 
-      if (!parse_var_set_vars (lexer, var_set, &vl, &nvl,
-                               PV_NO_DUPLICATE | PV_NO_SCRATCH)) 
+      if (!parse_const_var_set_vars (lexer, var_set, &vl, &nvl,
+                               PV_NO_DUPLICATE | PV_NO_SCRATCH))
         goto lossage;
-      
+
       n_dim++;
       nv_dim = xnrealloc (nv_dim, n_dim, sizeof *nv_dim);
       v_dim = xnrealloc (v_dim, n_dim, sizeof *v_dim);
@@ -159,15 +159,15 @@ mns_custom_tables (struct lexer *lexer, struct dataset *ds, struct cmd_means *cm
     }
   while (lex_match (lexer, T_BY));
 
-  var_set_destroy (var_set);
+  const_var_set_destroy (var_set);
   return 1;
 
  lossage:
-  var_set_destroy (var_set);
+  const_var_set_destroy (var_set);
   return 0;
 }
 
-/* 
+/*
    Local Variables:
    mode: c
    End: