From: Jim Meyering Date: Sun, 7 Nov 2004 07:05:38 +0000 (+0000) Subject: (merge): Remove declarations of now-unused variables. X-Git-Tag: v5.3.0~448 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d223551d72d76863a4d045378bbc80c825864a3;p=thirdparty%2Fcoreutils.git (merge): Remove declarations of now-unused variables. --- diff --git a/src/sort.c b/src/sort.c index a733958a85..992edc0c46 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); }