diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-06-30 05:36:19 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-06-30 05:36:19 +0000 |
| commit | e05f8c364b147303329e1254ffd271c59a74ac8c (patch) | |
| tree | fb0ec107cc01967aa645fb36f45ddf7fe792fb21 /usr.bin/sort/msort.c | |
| parent | ab026447852af8f27141e98f02890c898f63e6a9 (diff) | |
64bit fixes. Some of these are a bit bogus as there were "long"s
meant to be file offsets for fseek(3). However, those values
could never be > an int anyay so it is not a problem.
Diffstat (limited to 'usr.bin/sort/msort.c')
| -rw-r--r-- | usr.bin/sort/msort.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/sort/msort.c b/usr.bin/sort/msort.c index 24f6365a999..5b2e69f3621 100644 --- a/usr.bin/sort/msort.c +++ b/usr.bin/sort/msort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msort.c,v 1.5 1997/06/30 04:24:40 millert Exp $ */ +/* $OpenBSD: msort.c,v 1.6 1997/06/30 05:36:17 millert Exp $ */ /*- * Copyright (c) 1993 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)msort.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: msort.c,v 1.5 1997/06/30 04:24:40 millert Exp $"; +static char rcsid[] = "$OpenBSD: msort.c,v 1.6 1997/06/30 05:36:17 millert Exp $"; #endif #endif /* not lint */ @@ -58,17 +58,17 @@ static char rcsid[] = "$OpenBSD: msort.c,v 1.5 1997/06/30 04:24:40 millert Exp $ typedef struct mfile { u_char *end; short flno; - struct recheader rec[1]; + RECHEADER rec[1]; } MFILE; typedef struct tmfile { u_char *end; short flno; - struct trecheader rec[1]; + TRECHEADER rec[1]; } TMFILE; u_char *wts, *wts1 = 0; struct mfile *cfilebuf; -static int cmp __P((struct recheader *, struct recheader *)); +static int cmp __P((RECHEADER *, RECHEADER *)); static int insert __P((struct mfile **, struct mfile **, int, int)); void @@ -82,7 +82,7 @@ fmerge(binno, files, nfiles, get, outfp, fput, ftbl) { FILE *tout; int i, j, last; - void (*put)(struct recheader *, FILE *); + void (*put)(RECHEADER *, FILE *); extern int geteasy(); struct tempfile *l_fstack; @@ -145,7 +145,7 @@ void merge(infl0, nfiles, get, outfp, put, ftbl) int infl0, nfiles; int (*get)(); - void (*put)(struct recheader *, FILE *); + void (*put)(RECHEADER *, FILE *); FILE *outfp; struct field *ftbl; { @@ -260,7 +260,7 @@ order(infile, get, ftbl) { u_char *end; int c; - struct recheader *crec, *prec, *trec; + RECHEADER *crec, *prec, *trec; if (!SINGL_FLD) linebuf = malloc(MAXLLEN); @@ -294,7 +294,7 @@ order(infile, get, ftbl) static int cmp(rec1, rec2) - struct recheader *rec1, *rec2; + RECHEADER *rec1, *rec2; { register r; register u_char *pos1, *pos2, *end; |