From owner-svn-src-head@FreeBSD.ORG Tue Aug 17 09:51:08 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D97191065672; Tue, 17 Aug 2010 09:51:08 +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 C843A8FC16; Tue, 17 Aug 2010 09:51:08 +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 o7H9p8iK025991; Tue, 17 Aug 2010 09:51:08 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7H9p8Tc025989; Tue, 17 Aug 2010 09:51:08 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201008170951.o7H9p8Tc025989@svn.freebsd.org> From: Bruce Cran Date: Tue, 17 Aug 2010 09:51:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211419 - head/contrib/top X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 09:51:08 -0000 Author: brucec Date: Tue Aug 17 09:51:08 2010 New Revision: 211419 URL: http://svn.freebsd.org/changeset/base/211419 Log: 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 Approved by: rrs (mentor) MFC after: 2 weeks Modified: head/contrib/top/display.c Modified: head/contrib/top/display.c ============================================================================== --- head/contrib/top/display.c Tue Aug 17 09:42:50 2010 (r211418) +++ head/contrib/top/display.c Tue Aug 17 09:51:08 2010 (r211419) @@ -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;