Changed trns_chain_execute signature (Patch #6057)

[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 0dff0b02e32eb7058a614b0eacf21b9841a0cbc2..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
@@ -76,9 +75,9 @@ cmd_rename_variables (struct lexer *lexer, struct dataset *ds)
           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);
@@ -95,7 +94,7 @@ cmd_rename_variables (struct lexer *lexer, struct dataset *ds)
 
   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 (struct lexer *lexer, struct dataset *ds)
 
  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;
 }