diff options
Diffstat (limited to 'usr.bin/join/join.c')
| -rw-r--r-- | usr.bin/join/join.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index 8fd1cd57796..b7922cd8030 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -1,4 +1,4 @@ -/* $OpenBSD: join.c,v 1.23 2014/10/11 04:31:55 doug Exp $ */ +/* $OpenBSD: join.c,v 1.24 2015/01/16 06:40:08 deraadt Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -33,14 +33,14 @@ * SUCH DAMAGE. */ -#include <sys/param.h> - #include <err.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) + /* * There's a structure per input file which encapsulates the state of the * file. We repeatedly read lines from each file until we've read in all @@ -347,7 +347,7 @@ slurpit(INPUT *F) if (lp->linealloc <= len + 1) { char *p; u_long newsize = lp->linealloc + - MAX(100, len + 1 - lp->linealloc); + MAXIMUM(100, len + 1 - lp->linealloc); if ((p = realloc(lp->line, newsize)) == NULL) err(1, NULL); lp->line = p; |