diff options
Diffstat (limited to 'usr.bin/sort')
-rw-r--r-- | usr.bin/sort/extern.h | 58 | ||||
-rw-r--r-- | usr.bin/sort/fields.c | 4 | ||||
-rw-r--r-- | usr.bin/sort/files.c | 2 | ||||
-rw-r--r-- | usr.bin/sort/init.c | 12 | ||||
-rw-r--r-- | usr.bin/sort/msort.c | 4 | ||||
-rw-r--r-- | usr.bin/sort/sort.c | 14 | ||||
-rw-r--r-- | usr.bin/sort/sort.h | 7 |
7 files changed, 49 insertions, 52 deletions
diff --git a/usr.bin/sort/extern.h b/usr.bin/sort/extern.h index 6af2e03..3e1c03d 100644 --- a/usr.bin/sort/extern.h +++ b/usr.bin/sort/extern.h @@ -39,32 +39,32 @@ * $FreeBSD$ */ -void append __P((const u_char **, int, int, FILE *, - void (*)(const RECHEADER *, FILE *), struct field *)); -void concat __P((FILE *, FILE *)); -length_t enterkey __P((RECHEADER *, DBT *, size_t, struct field *)); -void fixit __P((int *, char **)); -void fldreset __P((struct field *)); -FILE *ftmp __P((void)); -void fmerge __P((int, int, struct filelist *, int, - get_func_t, FILE *, put_func_t, struct field *)); -void fsort __P((int, int, int, struct filelist *, int, FILE *, - struct field *)); -int geteasy __P((int, int, struct filelist *, - int, RECHEADER *, u_char *, struct field *)); -int getnext __P((int, int, struct filelist *, - int, RECHEADER *, u_char *, struct field *)); -int makekey __P((int, int, struct filelist *, - int, RECHEADER *, u_char *, struct field *)); -int makeline __P((int, int, struct filelist *, - int, RECHEADER *, u_char *, struct field *)); -void merge __P((int, int, get_func_t, FILE *, put_func_t, struct field *)); -void num_init __P((void)); -void onepass __P((const u_char **, int, long, long *, u_char *, FILE *)); -int optval __P((int, int)); -void order __P((struct filelist *, get_func_t, struct field *)); -void putline __P((const RECHEADER *, FILE *)); -void putrec __P((const RECHEADER *, FILE *)); -void rd_append __P((int, int, int, FILE *, u_char *, u_char *)); -int setfield __P((const char *, struct field *, int)); -void settables __P((int)); +void append(const u_char **, int, int, FILE *, + void (*)(const RECHEADER *, FILE *), struct field *); +void concat(FILE *, FILE *); +length_t enterkey(RECHEADER *, DBT *, size_t, struct field *); +void fixit(int *, char **); +void fldreset(struct field *); +FILE *ftmp(void); +void fmerge(int, int, struct filelist *, int, + get_func_t, FILE *, put_func_t, struct field *); +void fsort(int, int, int, struct filelist *, int, FILE *, + struct field *); +int geteasy(int, int, struct filelist *, + int, RECHEADER *, u_char *, struct field *); +int getnext(int, int, struct filelist *, + int, RECHEADER *, u_char *, struct field *); +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); +void order(struct filelist *, get_func_t, struct field *); +void putline(const RECHEADER *, FILE *); +void putrec(const RECHEADER *, FILE *); +void rd_append(int, int, int, FILE *, u_char *, u_char *); +int setfield(const char *, struct field *, int); +void settables(int); diff --git a/usr.bin/sort/fields.c b/usr.bin/sort/fields.c index 73c54f0..49b7bfe 100644 --- a/usr.bin/sort/fields.c +++ b/usr.bin/sort/fields.c @@ -61,8 +61,8 @@ __FBSDID("$FreeBSD$"); while (!((FLD_D | REC_D_F) & l_d_mask[*++pos])); \ } -static u_char *enterfield __P((u_char *, u_char *, struct field *, int)); -static u_char *number __P((u_char *, u_char *, u_char *, u_char *, int)); +static u_char *enterfield(u_char *, u_char *, struct field *, int); +static u_char *number(u_char *, u_char *, u_char *, u_char *, int); extern struct coldesc clist[(ND+1)*2]; extern int ncols; diff --git a/usr.bin/sort/files.c b/usr.bin/sort/files.c index fbd6aa2..28a6473 100644 --- a/usr.bin/sort/files.c +++ b/usr.bin/sort/files.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> -static int seq __P((FILE *, DBT *, DBT *)); +static int seq(FILE *, DBT *, DBT *); /* * this is the subroutine for file management for fsort(). diff --git a/usr.bin/sort/init.c b/usr.bin/sort/init.c index 0b3da88..861680e 100644 --- a/usr.bin/sort/init.c +++ b/usr.bin/sort/init.c @@ -51,12 +51,12 @@ __FBSDID("$FreeBSD$"); #include <ctype.h> #include <string.h> -static void insertcol __P((struct field *)); -static const char *setcolumn __P((const char *, struct field *, int)); -int setfield __P((const char *, struct field *, int)); -static int findgap __P((u_char *, int, int)); -static void shift_at_REC_D __P((u_char *, int)); -static int collcmp __P((const void *, const void *)); +static void insertcol(struct field *); +static const char *setcolumn(const char *, struct field *, int); +int setfield(const char *, struct field *, int); +static int findgap(u_char *, int, int); +static void shift_at_REC_D(u_char *, int); +static int collcmp(const void *, const void *); extern struct coldesc clist[(ND+1)*2]; extern int ncols; diff --git a/usr.bin/sort/msort.c b/usr.bin/sort/msort.c index 8a90944..ee371b9 100644 --- a/usr.bin/sort/msort.c +++ b/usr.bin/sort/msort.c @@ -64,8 +64,8 @@ typedef struct mfile { static u_char *wts, *wts1 = NULL; -static int cmp __P((RECHEADER *, RECHEADER *)); -static int insert __P((struct mfile **, struct mfile **, int, int)); +static int cmp(RECHEADER *, RECHEADER *); +static int insert(struct mfile **, struct mfile **, int, int); void fmerge(binno, top, filelist, nfiles, get, outfp, fput, ftbl) diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 59a6fa077..4a06c2e 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -92,17 +92,13 @@ char toutpath[MAXPATHLEN]; const char *tmpdir; /* where temporary files should be put */ -static void cleanup __P((void)); -static void onsignal __P((int)); -static void usage __P((const char *)); -static void many_files __P((void)); - -int main __P((int argc, char **argv)); +static void cleanup(void); +static void onsignal(int); +static void usage(const char *); +static void many_files(void); int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { get_func_t get; int ch, i, stdinflag = 0, tmp = 0; diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h index 6e1169f..3dc5857 100644 --- a/usr.bin/sort/sort.h +++ b/usr.bin/sort/sort.h @@ -36,6 +36,7 @@ * SUCH DAMAGE. * * @(#)sort.h 8.1 (Berkeley) 6/6/93 + * $FreeBSD$ */ #include <sys/param.h> @@ -133,9 +134,9 @@ struct filelist { const char * const * names; }; -typedef int (*get_func_t) __P((int, int, struct filelist *, int, - RECHEADER *, u_char *, struct field *)); -typedef void (*put_func_t) __P((const struct recheader *, FILE *)); +typedef int (*get_func_t)(int, int, struct filelist *, int, + RECHEADER *, u_char *, struct field *); +typedef void (*put_func_t)(const struct recheader *, FILE *); extern int PANIC; /* maximum depth of fsort before fmerge is called */ extern u_char ascii[NBINS], Rascii[NBINS], Ftable[NBINS], RFtable[NBINS]; |