From 800e219a2d1d606f7e5ec649ddcbdb7327e98815 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 14 Sep 1995 13:09:27 +0000 Subject: (sort): Rename local: ntemp -> n_temp_files, to avoid confusion with another local, ntmp. --- src/sort.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/sort.c') diff --git a/src/sort.c b/src/sort.c index 263a462ad..d0ceb5947 100644 --- 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); } } -- cgit v1.2.3-54-g00ecf