diff options
author | Jim Meyering <jim@meyering.net> | 2004-11-07 07:05:38 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2004-11-07 07:05:38 +0000 |
commit | 4d223551d72d76863a4d045378bbc80c825864a3 (patch) | |
tree | 82916646756e25d77190a4a711b5fad3a5fbacaa /src | |
parent | faba9a39bc2f2f2b4db7dc38f72dd57ab1c0a9d7 (diff) | |
download | coreutils-4d223551d72d76863a4d045378bbc80c825864a3.tar.xz |
(merge): Remove declarations of now-unused variables.
Diffstat (limited to 'src')
-rw-r--r-- | src/sort.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/sort.c b/src/sort.c index a733958a8..992edc0c4 100644 --- a/src/sort.c +++ b/src/sort.c @@ -1971,10 +1971,6 @@ static void merge (char **files, size_t n_temp_files, size_t nfiles, char const *output_file) { - size_t i; - bool got_outstat = false; - struct stat outstat; - while (NMERGE < nfiles) { /* Number of input files processed so far. */ @@ -2021,7 +2017,7 @@ merge (char **files, size_t n_temp_files, size_t nfiles, n_temp_files = out + (in < n_temp_files ? n_temp_files - in : 0); nfiles -= in - out; } - + nfiles = avoid_trashing_input (files, n_temp_files, nfiles, output_file); mergefps (files, nfiles, NULL, output_file); } |