X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvector.c;h=dd5c0cf47befaab278b2f292cc653d2154d888d1;hb=7658146ef345fbddfad02e76673afbb62c9aa4d6;hp=cd50970d389ee4fcfa8d1a3e5f49703f4c063760;hpb=077a1c38bd58911cb74a08f95be3691e49b87779;p=pspp-builds.git

diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c
index cd50970d..dd5c0cf4 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -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,7 +130,7 @@ 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)
@@ -140,14 +138,14 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
                       || !fmt_check_type_compat (&format, VAR_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;