(sort): Rename local: ntemp -> n_temp_files, to avoid confusion

with another local, ntmp.

diff --git a/src/sort.c b/src/sort.c
index 263a462ad5d8aff6c5c6ea91292e68ebf99beb13..d0ceb594704a441b17f626ec0365a7008a1bcc22 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -1315,7 +1315,7 @@ sort (files, nfiles, ofp)
   int i, ntmp;
   FILE *fp, *tfp;
   struct tempnode *node;
-  int ntemp = 0;
+  int n_temp_files = 0;
   char **tempfiles;
 
   initbuf (&buf, sortalloc);
@@ -1338,11 +1338,11 @@ sort (files, nfiles, ofp)
                xrealloc ((char *) tmp, ntmp * sizeof (struct line));
            }
          sortlines (lines.lines, lines.used, tmp);
-         if (feof (fp) && !nfiles && !ntemp && !buf.left)
+         if (feof (fp) && !nfiles && !n_temp_files && !buf.left)
            tfp = ofp;
          else
            {
-             ++ntemp;
+             ++n_temp_files;
              tfp = xfopen (tempname (), "w");
            }
          for (i = 0; i < lines.used; ++i)
@@ -1362,13 +1362,13 @@ sort (files, nfiles, ofp)
   free ((char *) lines.lines);
   free ((char *) tmp);
 
-  if (ntemp)
+  if (n_temp_files)
     {
-      tempfiles = (char **) xmalloc (ntemp * sizeof (char *));
-      i = ntemp;
+      tempfiles = (char **) xmalloc (n_temp_files * sizeof (char *));
+      i = n_temp_files;
       for (node = temphead.next; i > 0; node = node->next)
        tempfiles[--i] = node->name;
-      merge (tempfiles, ntemp, ofp);
+      merge (tempfiles, n_temp_files, ofp);
       free ((char *) tempfiles);
     }
 }