Delete trailing whitespace at end of lines.

[pspp-builds.git] / src / language / dictionary / rename-variables.c

diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c
index b2bd3d76899cf0dda8ed8f200ced8be14da4a170..c68474398ba677ac673960d5640b686cb6a51d79 100644 (file)
--- a/src/language/dictionary/rename-variables.c
+++ b/src/language/dictionary/rename-variables.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -38,7 +37,7 @@
 /* The code for this function is very similar to the code for the
    RENAME subcommand of MODIFY VARS. */
 int
-cmd_rename_variables (void)
+cmd_rename_variables (struct lexer *lexer, struct dataset *ds)
 {
   struct variable **rename_vars = NULL;
   char **rename_new_names = NULL;
@@ -47,7 +46,7 @@ cmd_rename_variables (void)
 
   int status = CMD_CASCADING_FAILURE;
 
-  if (proc_make_temporary_transformations_permanent ())
+  if (proc_make_temporary_transformations_permanent (ds))
     msg (SE, _("RENAME VARS may not be used after TEMPORARY.  "
                "Temporary transformations will be made permanent."));
 
@@ -56,46 +55,46 @@ cmd_rename_variables (void)
       size_t prev_nv_1 = rename_cnt;
       size_t prev_nv_2 = rename_cnt;
 
-      if (!lex_match ('('))
+      if (!lex_match (lexer, '('))
        {
          msg (SE, _("`(' expected."));
          goto lossage;
        }
-      if (!parse_variables (default_dict, &rename_vars, &rename_cnt,
+      if (!parse_variables (lexer, dataset_dict (ds), &rename_vars, &rename_cnt,
                            PV_APPEND | PV_NO_DUPLICATE))
        goto lossage;
-      if (!lex_match ('='))
+      if (!lex_match (lexer, '='))
        {
          msg (SE, _("`=' expected between lists of new and old variable names."));
          goto lossage;
        }
-      if (!parse_DATA_LIST_vars (&rename_new_names, &prev_nv_1, PV_APPEND))
+      if (!parse_DATA_LIST_vars (lexer, &rename_new_names, &prev_nv_1, PV_APPEND))
        goto lossage;
       if (prev_nv_1 != rename_cnt)
        {
           size_t i;
 
          msg (SE, _("Differing number of variables in old name list "
-                     "(%u) and in new name list (%u)."),
-              (unsigned) rename_cnt - prev_nv_2,
-               (unsigned) prev_nv_1 - prev_nv_2);
+                     "(%d) and in new name list (%d)."),
+              (int) (rename_cnt - prev_nv_2),
+               (int) (prev_nv_1 - prev_nv_2));
          for (i = 0; i < prev_nv_1; i++)
            free (rename_new_names[i]);
          free (rename_new_names);
          rename_new_names = NULL;
          goto lossage;
        }
-      if (!lex_match (')'))
+      if (!lex_match (lexer, ')'))
        {
          msg (SE, _("`)' expected after variable names."));
          goto lossage;
        }
     }
-  while (token != '.');
+  while (lex_token (lexer) != '.');
 
-  if (!dict_rename_vars (default_dict,
+  if (!dict_rename_vars (dataset_dict (ds),
                          rename_vars, rename_new_names, rename_cnt,
-                         &err_name)) 
+                         &err_name))
     {
       msg (SE, _("Renaming would duplicate variable name %s."), err_name);
       goto lossage;
@@ -105,12 +104,12 @@ cmd_rename_variables (void)
 
  lossage:
   free (rename_vars);
-  if (rename_new_names != NULL) 
+  if (rename_new_names != NULL)
     {
       size_t i;
       for (i = 0; i < rename_cnt; i++)
         free (rename_new_names[i]);
-      free (rename_new_names); 
+      free (rename_new_names);
     }
   return status;
 }