[Pspp-cvs] Changes to pspp/src/rename-vars.c

[Ben Pfaff]

Index: pspp/src/rename-vars.c
diff -u pspp/src/rename-vars.c:1.9 pspp/src/rename-vars.c:1.10
--- pspp/src/rename-vars.c:1.9  Sun Jul 31 21:42:46 2005
+++ pspp/src/rename-vars.c      Mon Oct 24 02:51:31 2005
@@ -39,13 +39,11 @@
 {
   struct variable **rename_vars = NULL;
   char **rename_new_names = NULL;
-  int rename_cnt = 0;
+  size_t rename_cnt = 0;
   char *err_name;
 
   int status = CMD_FAILURE;
 
-  int i;
-
   if (temporary != 0)
     {
       msg (SE, _("RENAME VARS may not be used after TEMPORARY.  "
@@ -55,8 +53,8 @@
 
   do
     {
-      int prev_nv_1 = rename_cnt;
-      int prev_nv_2 = rename_cnt;
+      size_t prev_nv_1 = rename_cnt;
+      size_t prev_nv_2 = rename_cnt;
 
       if (!lex_match ('('))
        {
@@ -75,9 +73,12 @@
        goto lossage;
       if (prev_nv_1 != rename_cnt)
        {
+          size_t i;
+
          msg (SE, _("Differing number of variables in old name list "
-              "(%d) and in new name list (%d)."),
-              rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2);
+                     "(%u) and in new name list (%u)."),
+              (unsigned) rename_cnt - prev_nv_2,
+               (unsigned) prev_nv_1 - prev_nv_2);
          for (i = 0; i < prev_nv_1; i++)
            free (rename_new_names[i]);
          free (rename_new_names);
@@ -106,6 +107,7 @@
   free (rename_vars);
   if (rename_new_names != NULL) 
     {
+      size_t i;
       for (i = 0; i < rename_cnt; i++)
         free (rename_new_names[i]);
       free (rename_new_names);