From owner-svn-src-all@FreeBSD.ORG  Mon Jun 28 08:30:11 2010
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 05D2A106566B;
	Mon, 28 Jun 2010 08:30:11 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EA2918FC19;
	Mon, 28 Jun 2010 08:30:10 +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 o5S8UAkU048908;
	Mon, 28 Jun 2010 08:30:10 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5S8UA3o048905;
	Mon, 28 Jun 2010 08:30:10 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201006280830.o5S8UA3o048905@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Mon, 28 Jun 2010 08:30:10 +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: r209567 - head/usr.bin/lock
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, 28 Jun 2010 08:30:11 -0000

Author: gavin
Date: Mon Jun 28 08:30:10 2010
New Revision: 209567
URL: http://svn.freebsd.org/changeset/base/209567

Log:
  Make WARNS=6 safe.
  
  Tested by:	make universe

Modified:
  head/usr.bin/lock/Makefile
  head/usr.bin/lock/lock.c

Modified: head/usr.bin/lock/Makefile
==============================================================================
--- head/usr.bin/lock/Makefile	Mon Jun 28 08:10:55 2010	(r209566)
+++ head/usr.bin/lock/Makefile	Mon Jun 28 08:30:10 2010	(r209567)
@@ -7,6 +7,4 @@ BINMODE=4555
 DPADD=	${LIBCRYPT}
 LDADD=	-lcrypt
 
-WARNS?=	1
-
 .include <bsd.prog.mk>

Modified: head/usr.bin/lock/lock.c
==============================================================================
--- head/usr.bin/lock/lock.c	Mon Jun 28 08:10:55 2010	(r209566)
+++ head/usr.bin/lock/lock.c	Mon Jun 28 08:30:10 2010	(r209567)
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <errno.h>
 #include <pwd.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -257,9 +258,9 @@ hi(int signo __unused)
 		if (no_timeout) {
 			(void)putchar('\n');
 		} else {
-			(void)printf("timeout in %ld:%ld minutes\n",
-			    (nexttime - timval.tv_sec) / 60,
-			    (nexttime - timval.tv_sec) % 60);
+			(void)printf("timeout in %jd:%jd minutes\n",
+			    (intmax_t)(nexttime - timval.tv_sec) / 60,
+			    (intmax_t)(nexttime - timval.tv_sec) % 60);
 		}
 	}
 }