diff options
| author | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-06-05 06:21:58 -0500 |
|---|---|---|
| committer | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-06-05 06:21:58 -0500 |
| commit | 58c9a4b908c79c0b6183951e7dd68dc69cbf4415 (patch) | |
| tree | 1740bfc98bfe3804d10a914e5dc3e237ae169b7f /usr.bin/sort/fsort.c | |
| parent | 0a732af73aa7a2378e6981d3a7443e50fd291d2c (diff) | |
| download | userland-58c9a4b908c79c0b6183951e7dd68dc69cbf4415.tar.gz userland-58c9a4b908c79c0b6183951e7dd68dc69cbf4415.tar.bz2 userland-58c9a4b908c79c0b6183951e7dd68dc69cbf4415.tar.xz userland-58c9a4b908c79c0b6183951e7dd68dc69cbf4415.zip | |
usr.bin/sort: make buildable with libbsd
Diffstat (limited to 'usr.bin/sort/fsort.c')
| -rw-r--r-- | usr.bin/sort/fsort.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/sort/fsort.c b/usr.bin/sort/fsort.c index c229ae2..124bd82 100644 --- a/usr.bin/sort/fsort.c +++ b/usr.bin/sort/fsort.c @@ -71,8 +71,6 @@ #include "sort.h" #include "fsort.h" -__RCSID("$NetBSD: fsort.c,v 1.47 2010/02/05 21:58:41 enami Exp $"); - #include <stdlib.h> #include <string.h> @@ -85,7 +83,7 @@ fsort(struct filelist *filelist, int nfiles, FILE *outfp, struct field *ftbl) RECHEADER **keypos, **keyp; RECHEADER *buffer; size_t bufsize = DEFBUFSIZE; - u_char *bufend; + unsigned char *bufend; int mfct = 0; int c, nelem; get_func_t get; @@ -96,7 +94,7 @@ fsort(struct filelist *filelist, int nfiles, FILE *outfp, struct field *ftbl) int max_recs = DEBUG('m') ? 16 : MAXNUM; buffer = allocrec(NULL, bufsize); - bufend = (u_char *)buffer + bufsize; + bufend = (unsigned char *)buffer + bufsize; /* Allocate double length keymap for radix_sort */ keylist = malloc(2 * max_recs * sizeof(*keylist)); if (buffer == NULL || keylist == NULL) @@ -166,7 +164,7 @@ fsort(struct filelist *filelist, int nfiles, FILE *outfp, struct field *ftbl) crec = nbuffer + (crec - buffer); buffer = nbuffer; - bufend = (u_char *)buffer + bufsize; + bufend = (unsigned char *)buffer + bufsize; } /* Sort this set of records */ |