X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flanguage%2Flexer%2Fvariable-parser.c;h=1194110efa3ac850ed1584451e2782ec12870b83;hb=65190c89174ad703a008c89bfc70154dff12def0;hp=26b2e1bfd2537d3fff65978a93e1458a09492a30;hpb=48386ee68a5283653435d05a9ea4e449710fd370;p=pspp-builds.git
diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c
index 26b2e1bf..1194110e 100644
--- a/src/language/lexer/variable-parser.c
+++ b/src/language/lexer/variable-parser.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
@@ -37,6 +34,8 @@
#include
#include
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -116,12 +115,6 @@ parse_variables (struct lexer *lexer, const struct dictionary *d,
vs = var_set_create_from_dict (d);
success = parse_var_set_vars (lexer, vs, var, cnt, opts);
- if ( success == 0 )
- {
- free ( *var ) ;
- *var = NULL;
- *cnt = 0;
- }
var_set_destroy (vs);
return success;
}
@@ -199,7 +192,7 @@ add_variable (struct variable ***v, size_t *nv, size_t *mv,
&& var_get_width (add) != var_get_width ((*v)[0]))
msg (SE, _("%s and %s are string variables with different widths. "
"All variables in this variable list must have the "
- "same width. %s will be omttied from the list."),
+ "same width. %s will be omitted from the list."),
var_get_name ((*v)[0]), add_name, add_name);
else if ((pv_opts & PV_NO_DUPLICATE) && included[idx])
msg (SE, _("Variable %s appears twice in variable list."), add_name);
@@ -412,8 +405,8 @@ parse_DATA_LIST_vars (struct lexer *lexer, char ***names, size_t *nnames, int pv
int d1, d2;
int n;
size_t nvar, mvar;
- char name1[LONG_NAME_LEN + 1], name2[LONG_NAME_LEN + 1];
- char root1[LONG_NAME_LEN + 1], root2[LONG_NAME_LEN + 1];
+ char name1[VAR_NAME_LEN + 1], name2[VAR_NAME_LEN + 1];
+ char root1[VAR_NAME_LEN + 1], root2[VAR_NAME_LEN + 1];
int success = 0;
assert (names != NULL);
@@ -481,7 +474,7 @@ parse_DATA_LIST_vars (struct lexer *lexer, char ***names, size_t *nnames, int pv
for (n = n1; n <= n2; n++)
{
- char name[LONG_NAME_LEN + 1];
+ char name[VAR_NAME_LEN + 1];
sprintf (name, "%s%0*d", root1, d1, n);
(*names)[nvar] = xstrdup (name);
nvar++;
@@ -671,7 +664,7 @@ var_set_lookup_var_idx (const struct var_set *vs, const char *name,
{
assert (vs != NULL);
assert (name != NULL);
- assert (strlen (name) <= LONG_NAME_LEN);
+ assert (strlen (name) <= VAR_NAME_LEN);
return vs->lookup_var_idx (vs, name, idx);
}