X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=6af0b62c57aa981175253e0f5dd04f2ad10f9640;hb=37273a2e5b058a1907bc7b4b5bf666c64e0afdbb;hp=a0d59c2285a9097c525e9397182fef3cbf72342d;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp-builds.git

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index a0d59c22..6af0b62c 100644
--- 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,8 +35,8 @@
 
 /* Declarations. */
 
-static int do_value_labels (struct lexer *, 
-			    const struct dictionary *dict, int);
+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);
 static int get_label (struct lexer *, struct variable **vars, size_t var_cnt);
@@ -48,29 +46,29 @@ static int get_label (struct lexer *, struct variable **vars, size_t var_cnt);
 int
 cmd_value_labels (struct lexer *lexer, struct dataset *ds)
 {
-  return do_value_labels (lexer, dataset_dict (ds), 1);
+  return do_value_labels (lexer, dataset_dict (ds), true);
 }
 
 int
 cmd_add_value_labels (struct lexer *lexer, struct dataset *ds)
 {
-  return do_value_labels (lexer, dataset_dict (ds), 0);
+  return do_value_labels (lexer, dataset_dict (ds), false);
 }
 
 /* Do it. */
 
 static int
-do_value_labels (struct lexer *lexer, const struct dictionary *dict, int erase)
+do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
 {
   struct variable **vars; /* Variable list. */
   size_t var_cnt;         /* Number of variables. */
   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)
 	{
@@ -115,7 +113,7 @@ verify_val_labs (struct variable **vars, size_t var_cnt)
 
   for (i = 0; i < var_cnt; i++)
     {
-      struct variable *vp = vars[i];
+      const struct variable *vp = vars[i];
 
       if (var_is_long_string (vp))
 	{
@@ -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)