From owner-svn-src-all@freebsd.org  Fri Apr 22 03:46:58 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85C59B17078;
 Fri, 22 Apr 2016 03:46:58 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 466EF1DE7;
 Fri, 22 Apr 2016 03:46:58 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3M3kvB0058930;
 Fri, 22 Apr 2016 03:46:57 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3M3kvbW058929;
 Fri, 22 Apr 2016 03:46:57 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201604220346.u3M3kvbW058929@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: araujo set sender to
 araujo@FreeBSD.org using -f
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Fri, 22 Apr 2016 03:46:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298444 - head/usr.bin/vmstat
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Apr 2016 03:46:58 -0000

Author: araujo
Date: Fri Apr 22 03:46:57 2016
New Revision: 298444
URL: https://svnweb.freebsd.org/changeset/base/298444

Log:
  Use MIN() macro from sys/param.h.
  
  MFC after:	2 weeks.

Modified:
  head/usr.bin/vmstat/vmstat.c

Modified: head/usr.bin/vmstat/vmstat.c
==============================================================================
--- head/usr.bin/vmstat/vmstat.c	Fri Apr 22 03:43:06 2016	(r298443)
+++ head/usr.bin/vmstat/vmstat.c	Fri Apr 22 03:46:57 2016	(r298444)
@@ -884,7 +884,7 @@ printhdr(int maxid, u_long cpumask)
 {
 	int i, num_shown;
 
-	num_shown = (num_selected < maxshowdevs) ? num_selected : maxshowdevs;
+	num_shown = MIN(num_selected, maxshowdevs);
 	if (hflag) {
 		xo_emit("{T:procs}  {T:memory}       {T:/page%*s}", 19, "");
 	} else {