From owner-svn-src-stable@FreeBSD.ORG  Sat Sep 11 14:26:18 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5F1F10656C1;
	Sat, 11 Sep 2010 14:26:18 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D52778FC17;
	Sat, 11 Sep 2010 14:26:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8BEQIXJ004851;
	Sat, 11 Sep 2010 14:26:18 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8BEQINf004849;
	Sat, 11 Sep 2010 14:26:18 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201009111426.o8BEQINf004849@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sat, 11 Sep 2010 14:26:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212470 - stable/8/contrib/top
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Sep 2010 14:26:19 -0000

Author: brucec
Date: Sat Sep 11 14:26:18 2010
New Revision: 212470
URL: http://svn.freebsd.org/changeset/base/212470

Log:
  MFC r211419:
  
  Since top displays the uptime including seconds, there is no need to add 30
  onto it, which may have been used for rounding purposes in other utilities.
  
  PR:		bin/147934
  Submitted by:	Janne Snabb <snabb at epipe.com>
  Approved by:	rrs (mentor)

Modified:
  stable/8/contrib/top/display.c
Directory Properties:
  stable/8/contrib/top/   (props changed)
  stable/8/contrib/top/install-sh   (props changed)

Modified: stable/8/contrib/top/display.c
==============================================================================
--- stable/8/contrib/top/display.c	Sat Sep 11 14:21:02 2010	(r212469)
+++ stable/8/contrib/top/display.c	Sat Sep 11 14:26:18 2010	(r212470)
@@ -1273,7 +1273,6 @@ time_t *tod;
 
     if (bt->tv_sec != -1) {
 	uptime = *tod - bt->tv_sec;
-	uptime += 30;
 	days = uptime / 86400;
 	uptime %= 86400;
 	hrs = uptime / 3600;