From 58c9a4b908c79c0b6183951e7dd68dc69cbf4415 Mon Sep 17 00:00:00 2001 From: Kiyoshi Aman Date: Wed, 5 Jun 2019 06:21:58 -0500 Subject: usr.bin/sort: make buildable with libbsd --- usr.bin/sort/fsort.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'usr.bin/sort/fsort.c') 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 #include @@ -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 */ -- cgit v1.2.3-60-g2f50