X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdictionary%2Fvector.c;h=1a616ab27ad858170f96ae7e99af12a91fe79c31;hb=d8ffe656444590f1199f62ac3ebdb9b7692923c2;hp=cd50970d389ee4fcfa8d1a3e5f49703f4c063760;hpb=077a1c38bd58911cb74a08f95be3691e49b87779;p=pspp
diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c
index cd50970d38..1a616ab27a 100644
--- a/src/language/dictionary/vector.c
+++ b/src/language/dictionary/vector.c
@@ -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
@@ -28,7 +26,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -36,6 +33,7 @@
#include
#include "intprops.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -60,7 +58,7 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
while (lex_token (lexer) == T_ID)
{
size_t i;
-
+
if (dict_lookup_vector (dict, lex_tokid (lexer)))
{
msg (SE, _("A vector named %s already exists."),
@@ -79,7 +77,7 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
if (vector_cnt == vector_cap)
vectors = pool_2nrealloc (pool,
vectors, &vector_cap, sizeof *vectors);
- vectors[vector_cnt++] = xstrdup (lex_tokid (lexer));
+ vectors[vector_cnt++] = pool_strdup (pool, lex_tokid (lexer));
lex_get (lexer);
lex_match (lexer, ',');
@@ -111,7 +109,7 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
/* Short form. */
struct fmt_spec format;
bool seen_format = false;
-
+
struct variable **vars;
int var_cnt;
@@ -120,9 +118,9 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
var_cnt = 0;
format = fmt_for_output (FMT_F, 8, 2);
seen_format = false;
- while (!lex_match (lexer, ')'))
+ while (!lex_match (lexer, ')'))
{
- if (lex_is_integer (lexer) && var_cnt == 0)
+ if (lex_is_integer (lexer) && var_cnt == 0)
{
var_cnt = lex_integer (lexer);
lex_get (lexer);
@@ -132,38 +130,38 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
goto fail;
}
}
- else if (lex_token (lexer) == T_ID && !seen_format)
+ else if (lex_token (lexer) == T_ID && !seen_format)
{
seen_format = true;
if (!parse_format_specifier (lexer, &format)
|| !fmt_check_output (&format)
- || !fmt_check_type_compat (&format, VAR_NUMERIC))
+ || !fmt_check_type_compat (&format, VAL_NUMERIC))
goto fail;
}
- else
+ else
{
lex_error (lexer, NULL);
goto fail;
}
lex_match (lexer, ',');
}
- if (var_cnt == 0)
+ if (var_cnt == 0)
{
lex_error (lexer, _("expecting vector length"));
goto fail;
}
/* Check that none of the variables exist and that
- their names are no more than LONG_NAME_LEN bytes
+ their names are no more than VAR_NAME_LEN bytes
long. */
for (i = 0; i < vector_cnt; i++)
{
int j;
for (j = 0; j < var_cnt; j++)
{
- char name[LONG_NAME_LEN + INT_STRLEN_BOUND (int) + 1];
+ char name[VAR_NAME_LEN + INT_STRLEN_BOUND (int) + 1];
sprintf (name, "%s%d", vectors[i], j + 1);
- if (strlen (name) > LONG_NAME_LEN)
+ if (strlen (name) > VAR_NAME_LEN)
{
msg (SE, _("%s is too long for a variable name."), name);
goto fail;
@@ -183,7 +181,7 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
int j;
for (j = 0; j < var_cnt; j++)
{
- char name[LONG_NAME_LEN + 1];
+ char name[VAR_NAME_LEN + 1];
sprintf (name, "%s%d", vectors[i], j + 1);
vars[j] = dict_create_var_assert (dict, name, 0);
var_set_both_formats (vars[j], &format);