From 4a82f108890a8d167716dbcbb4e3ba31b188ae57 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Mon, 12 Jul 2010 15:32:45 +0000 Subject: [PATCH] Use type-specific inline function imax() instead of deprecated macro MAX(). Prodded by: bde --- lib/libstand/printf.c | 3 +-- sys/kern/subr_prf.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libstand/printf.c b/lib/libstand/printf.c index 97cf8f7eaa56..977c02638833 100644 --- a/lib/libstand/printf.c +++ b/lib/libstand/printf.c @@ -151,7 +151,6 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) static int kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap) { -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) #define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; } char nbuf[MAXNBUF]; char *d; @@ -422,7 +421,7 @@ reswitch: switch (ch = (u_char)*fmt++) { if (!ladjust && padc == '0') dwidth = width - tmp; - width -= tmp + MAX(dwidth, n); + width -= tmp + imax(dwidth, n); dwidth -= n; if (!ladjust) while (width-- > 0) diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 776c4e80cbd6..d0d2ad7f3614 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -813,7 +813,7 @@ reswitch: switch (ch = (u_char)*fmt++) { if (!ladjust && padc == '0') dwidth = width - tmp; - width -= tmp + MAX(dwidth, n); + width -= tmp + imax(dwidth, n); dwidth -= n; if (!ladjust) while (width-- > 0)