X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fmeans.q;h=071253f3efa17ab64e2f412c724011055f3186d1;hb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;hp=b952df19a4e084260f9b76a57e8036125b9886ce;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/language/stats/means.q b/src/language/stats/means.q
index b952df19a4..071253f3ef 100644
--- a/src/language/stats/means.q
+++ b/src/language/stats/means.q
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -26,11 +24,11 @@
#include
#include
#include
-#include
#include
-#include
#include
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -53,7 +51,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 +62,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 +106,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 +121,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 +136,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 +157,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: