Change license from GPLv2+ to GPLv3+.

[pspp-builds.git] / src / language / dictionary / value-labels.c

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index a1585a8a906c94e99a7499b5282055541aaef638..6af0b62c57aa981175253e0f5dd04f2ad10f9640 100644 (file)
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.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>
 
@@ -37,7 +35,7 @@
 \f
 /* Declarations. */
 
-static int do_value_labels (struct lexer *, 
+static int do_value_labels (struct lexer *,
                            const struct dictionary *dict, bool);
 static int verify_val_labs (struct variable **vars, size_t var_cnt);
 static void erase_labels (struct variable **vars, size_t var_cnt);
@@ -67,10 +65,10 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
   int parse_err=0;        /* true if error parsing variables */
 
   lex_match (lexer, '/');
-  
+
   while (lex_token (lexer) != '.')
     {
-      parse_err = !parse_variables (lexer, dict, &vars, &var_cnt, 
+      parse_err = !parse_variables (lexer, dict, &vars, &var_cnt,
                                    PV_SAME_TYPE) ;
       if (var_cnt < 1)
        {
@@ -129,7 +127,7 @@ verify_val_labs (struct variable **vars, size_t var_cnt)
 
 /* Erases all the labels for the VAR_CNT variables in VARS. */
 static void
-erase_labels (struct variable **vars, size_t var_cnt) 
+erase_labels (struct variable **vars, size_t var_cnt)
 {
   size_t i;
 
@@ -177,7 +175,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
       /* Set label. */
       if (!lex_force_string (lexer))
        return 0;
-      
+
       ds_init_string (&label, lex_tokstr (lexer));
 
       if (ds_length (&label) > 60)