From owner-svn-src-all@freebsd.org  Wed Apr 27 02:44:12 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 03B1DB1D60A;
 Wed, 27 Apr 2016 02:44:12 +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 C9FEC18BD;
 Wed, 27 Apr 2016 02:44:11 +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 u3R2iBJ2051694;
 Wed, 27 Apr 2016 02:44:11 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3R2iBRn051693;
 Wed, 27 Apr 2016 02:44:11 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201604270244.u3R2iBRn051693@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: Wed, 27 Apr 2016 02:44:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298686 - head/usr.bin/top
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: Wed, 27 Apr 2016 02:44:12 -0000

Author: araujo
Date: Wed Apr 27 02:44:10 2016
New Revision: 298686
URL: https://svnweb.freebsd.org/changeset/base/298686

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

Modified:
  head/usr.bin/top/machine.c

Modified: head/usr.bin/top/machine.c
==============================================================================
--- head/usr.bin/top/machine.c	Wed Apr 27 02:34:25 2016	(r298685)
+++ head/usr.bin/top/machine.c	Wed Apr 27 02:44:10 2016	(r298686)
@@ -1023,7 +1023,7 @@ format_next_process(caddr_t handle, char
 					continue;
 				len = (argbuflen - (dst - argbuf) - 1) / 4;
 				strvisx(dst, src,
-				    strlen(src) < len ? strlen(src) : len,
+				    MIN(strlen(src), len),
 				    VIS_NL | VIS_CSTYLE);
 				while (*dst != '\0')
 					dst++;