Date: Mon, 12 Jul 2010 15:32:45 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r209949 - in head: lib/libstand sys/kern Message-ID: <201007121532.o6CFWjPS037093@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Jul 12 15:32:45 2010 New Revision: 209949 URL: http://svn.freebsd.org/changeset/base/209949 Log: Use type-specific inline function imax() instead of deprecated macro MAX(). Prodded by: bde Modified: head/lib/libstand/printf.c head/sys/kern/subr_prf.c Modified: head/lib/libstand/printf.c ============================================================================== --- head/lib/libstand/printf.c Mon Jul 12 14:27:49 2010 (r209948) +++ head/lib/libstand/printf.c Mon Jul 12 15:32:45 2010 (r209949) @@ -151,7 +151,6 @@ ksprintn(char *nbuf, uintmax_t num, int 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 @@ number: if (!ladjust && padc == '0') dwidth = width - tmp; - width -= tmp + MAX(dwidth, n); + width -= tmp + imax(dwidth, n); dwidth -= n; if (!ladjust) while (width-- > 0) Modified: head/sys/kern/subr_prf.c ============================================================================== --- head/sys/kern/subr_prf.c Mon Jul 12 14:27:49 2010 (r209948) +++ head/sys/kern/subr_prf.c Mon Jul 12 15:32:45 2010 (r209949) @@ -813,7 +813,7 @@ number: if (!ladjust && padc == '0') dwidth = width - tmp; - width -= tmp + MAX(dwidth, n); + width -= tmp + imax(dwidth, n); dwidth -= n; if (!ladjust) while (width-- > 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007121532.o6CFWjPS037093>