From owner-svn-src-head@FreeBSD.ORG  Sat Sep  1 10:56:15 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 E78AD106566B;
	Sat,  1 Sep 2012 10:56:15 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D28C78FC0C;
	Sat,  1 Sep 2012 10:56:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q81AuFUA097114;
	Sat, 1 Sep 2012 10:56:15 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q81AuFIs097112;
	Sat, 1 Sep 2012 10:56:15 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201209011056.q81AuFIs097112@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 1 Sep 2012 10:56:15 +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: r239988 - head/usr.sbin/lmcconfig
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Sep 2012 10:56:16 -0000

Author: ed
Date: Sat Sep  1 10:56:15 2012
New Revision: 239988
URL: http://svn.freebsd.org/changeset/base/239988

Log:
  Rework time handling.
  
  After I made the previous commit, I noticed the code does some things it
  shouldn't. It casts a struct timeval to a time_t, assuming tv_sec is the
  first member. Also, we are not interested in microseconds, so it is
  better to just call time(NULL).
  
  MFC after:	1 month

Modified:
  head/usr.sbin/lmcconfig/lmcconfig.c

Modified: head/usr.sbin/lmcconfig/lmcconfig.c
==============================================================================
--- head/usr.sbin/lmcconfig/lmcconfig.c	Sat Sep  1 10:52:19 2012	(r239987)
+++ head/usr.sbin/lmcconfig/lmcconfig.c	Sat Sep  1 10:56:15 2012	(r239988)
@@ -1074,17 +1074,16 @@ print_hssi_sigs(void)
 static void
 print_events(void)
 {
-  char *time;
-  struct timeval tv;
+  const char *reset_time;
+  time_t now;
 
-  gettimeofday(&tv, NULL);
-  time = (char *)ctime((time_t *)&tv);
-  printf("Current time:\t\t%s", time);
+  now = time(NULL);
+  printf("Current time:\t\t%s", ctime(&now));
   if (status.cntrs.reset_time.tv_sec < 1000)
-    time = "Never\n";
+    reset_time = "Never\n";
   else
-    time = (char *)ctime((time_t *)&status.cntrs.reset_time.tv_sec);
-  printf("Cntrs reset:\t\t%s", time);
+    reset_time = ctime(&status.cntrs.reset_time.tv_sec);
+  printf("Cntrs reset:\t\t%s", reset_time);
 
   if (status.cntrs.ibytes)     printf("Rx bytes:\t\t%ju\n",    (uintmax_t)status.cntrs.ibytes);
   if (status.cntrs.obytes)     printf("Tx bytes:\t\t%ju\n",    (uintmax_t)status.cntrs.obytes);