CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-12 23:08:17 +02:00
Code Issues Projects Releases Wiki Activity

(merge): Move declarations of local variables into

Browse Source 
the inner scope where they're used.
(sort): Likewise.
This commit is contained in:
Jim Meyering
2001-03-13 08:34:38 +00:00
parent 25a9e171a2
commit 593d17ffe4
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sort.c
View File

@@ -1837,13 +1837,11 @@ check (char **files, int nfiles)
static void
merge (char **files, int nfiles, int max_merge, char const *output_file)
{
int i, t;
char *temp;
FILE *tfp;
while (max_merge < nfiles)
{
t = 0;
FILE *tfp;
int i, t = 0;
char *temp;
for (i = 0; i < nfiles / NMERGE; ++i)
{
temp = create_temp_file (&tfp);
@@ -1867,10 +1865,7 @@ static void
sort (char **files, int nfiles, char const *output_file)
{
struct buffer buf;
FILE *tfp;
struct tempnode *node;
int n_temp_files = 0;
char **tempfiles;
buf.alloc = 0;
@@ -1879,6 +1874,7 @@ sort (char **files, int nfiles, char const *output_file)
char const *temp_output;
char const *file = *files;
FILE *fp = xfopen (file, "r");
FILE *tfp;
if (! buf.alloc)
initbuf (&buf, 2 * sizeof (struct line),
@@ -1944,7 +1940,8 @@ sort (char **files, int nfiles, char const *output_file)
if (n_temp_files)
{
int i = n_temp_files;
tempfiles = (char **) xmalloc (n_temp_files * sizeof (char *));
struct tempnode *node;
char **tempfiles = (char **) xmalloc (n_temp_files * sizeof (char *));
for (node = temphead; i > 0; node = node->next)
tempfiles[--i] = node->name;
merge (tempfiles, n_temp_files, NMERGE, output_file);