Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make function merge() static in msort.c 

cosmetic change to how local variable is incremented (moved to for(;;))
This commit is contained in:
jdolecek 2002-12-25 21:19:15 +00:00
parent 0a970e7423
commit 63ae9a5e5f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/sort/msort.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: msort.c,v 1.10 2001/02/19 20:50:17 jdolecek Exp $ */
/* $NetBSD: msort.c,v 1.11 2002/12/25 21:19:15 jdolecek Exp $ */
/*-
* Copyright (c) 1993
@ -40,7 +40,7 @@
#include "fsort.h"
#ifndef lint
__RCSID("$NetBSD: msort.c,v 1.10 2001/02/19 20:50:17 jdolecek Exp $");
__RCSID("$NetBSD: msort.c,v 1.11 2002/12/25 21:19:15 jdolecek Exp $");
__SCCSID("@(#)msort.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@ -61,6 +61,7 @@ static u_char *wts, *wts1 = NULL;
static int cmp __P((RECHEADER *, RECHEADER *));
static int insert __P((struct mfile **, struct mfile **, int, int));
static void merge(int, int, get_func_t, FILE *, put_func_t, struct field *);
void
fmerge(binno, top, filelist, nfiles, get, outfp, fput, ftbl)
@ -133,7 +134,7 @@ fmerge(binno, top, filelist, nfiles, get, outfp, fput, ftbl)
}
}
void
static void
merge(infl0, nfiles, get, outfp, put, ftbl)
int infl0, nfiles;
get_func_t get;
@ -163,7 +164,7 @@ merge(infl0, nfiles, get, outfp, put, ftbl)
bufs_sz[i] = DEFLLEN;
}
for (i = j = 0; i < nfiles; i++) {
for (i = j = 0; i < nfiles; i++, j++) {
cfile = (struct mfile *) bufs[j];
cfile->flno = infl0 + j;
cfile->end = (u_char *) bufs[j] + bufs_sz[j];
@ -193,7 +194,6 @@ merge(infl0, nfiles, get, outfp, put, ftbl)
else
flist[0] = cfile;
}
j++;
}
cfile = (struct mfile *) bufs[nf];

3
usr.bin/sort/sort.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sort.h,v 1.14 2002/12/24 15:02:46 jdolecek Exp $ */
/* $NetBSD: sort.h,v 1.15 2002/12/25 21:19:15 jdolecek Exp $ */
/*-
* Copyright (c) 1993
@ -166,7 +166,6 @@ int makekey(int, int, struct filelist *,
int, RECHEADER *, u_char *, struct field *);
int makeline(int, int, struct filelist *,
int, RECHEADER *, u_char *, struct field *);
void merge(int, int, get_func_t, FILE *, put_func_t, struct field *);
void num_init(void);
void onepass(const u_char **, int, long, long *, u_char *, FILE *);
int optval(int, int);