From owner-svn-src-all@FreeBSD.ORG  Mon Dec 19 20:29:51 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7AA031065675;
	Mon, 19 Dec 2011 20:29:51 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 698E98FC0A;
	Mon, 19 Dec 2011 20:29:51 +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 pBJKTpQq073859;
	Mon, 19 Dec 2011 20:29:51 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBJKTpDc073856;
	Mon, 19 Dec 2011 20:29:51 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112192029.pBJKTpDc073856@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 19 Dec 2011 20:29:51 +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: r228719 - head/usr.sbin/timed/timed
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Dec 2011 20:29:51 -0000

Author: dim
Date: Mon Dec 19 20:29:50 2011
New Revision: 228719
URL: http://svn.freebsd.org/changeset/base/228719

Log:
  Some people pointed out long is 32-bit on some arches, while time_t is
  64-bit, so better cast time_t to intmax_t, and use the appropriate
  printf format strings.
  
  MFC after:	1 week

Modified:
  head/usr.sbin/timed/timed/correct.c
  head/usr.sbin/timed/timed/readmsg.c

Modified: head/usr.sbin/timed/timed/correct.c
==============================================================================
--- head/usr.sbin/timed/timed/correct.c	Mon Dec 19 20:01:21 2011	(r228718)
+++ head/usr.sbin/timed/timed/correct.c	Mon Dec 19 20:29:50 2011	(r228719)
@@ -162,8 +162,8 @@ adjclock(corr)
 		}
 	} else {
 		syslog(LOG_WARNING,
-		       "clock correction %ld sec too large to adjust",
-		       (long)adj.tv_sec);
+		       "clock correction %jd sec too large to adjust",
+		       (intmax_t)adj.tv_sec);
 		(void) gettimeofday(&now, 0);
 		timevaladd(&now, corr);
 		if (settimeofday(&now, 0) < 0)

Modified: head/usr.sbin/timed/timed/readmsg.c
==============================================================================
--- head/usr.sbin/timed/timed/readmsg.c	Mon Dec 19 20:01:21 2011	(r228718)
+++ head/usr.sbin/timed/timed/readmsg.c	Mon Dec 19 20:29:50 2011	(r228719)
@@ -181,8 +181,8 @@ again:
 			rwait.tv_usec = 1000000/CLK_TCK;
 
 		if (trace) {
-			fprintf(fd, "readmsg: wait %ld.%6ld at %s\n",
-				(long)rwait.tv_sec, rwait.tv_usec, date());
+			fprintf(fd, "readmsg: wait %jd.%6ld at %s\n",
+				(intmax_t)rwait.tv_sec, rwait.tv_usec, date());
 			/* Notice a full disk, as we flush trace info.
 			 * It is better to flush periodically than at
 			 * every line because the tracing consists of bursts