From owner-svn-src-all@FreeBSD.ORG  Fri Feb 26 13:47:51 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 82DC6106566B;
	Fri, 26 Feb 2010 13:47:51 +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 727B58FC17;
	Fri, 26 Feb 2010 13:47:51 +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 o1QDlpXu056132;
	Fri, 26 Feb 2010 13:47:51 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1QDlpNT056130;
	Fri, 26 Feb 2010 13:47:51 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201002261347.o1QDlpNT056130@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 26 Feb 2010 13:47: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: r204358 - head/usr.bin/pr
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: Fri, 26 Feb 2010 13:47:51 -0000

Author: ed
Date: Fri Feb 26 13:47:51 2010
New Revision: 204358
URL: http://svn.freebsd.org/changeset/base/204358

Log:
  Use time(NULL) instead of gettimeofday(), because we only need tv_sec.

Modified:
  head/usr.bin/pr/pr.c

Modified: head/usr.bin/pr/pr.c
==============================================================================
--- head/usr.bin/pr/pr.c	Fri Feb 26 12:40:01 2010	(r204357)
+++ head/usr.bin/pr/pr.c	Fri Feb 26 13:47:51 2010	(r204358)
@@ -1265,9 +1265,7 @@ FILE *
 nxtfile(int argc, char **argv, const char **fname, char *buf, int dt)
 {
 	FILE *inf = NULL;
-	struct timeval tv;
 	time_t tv_sec;
-	struct timezone tz;
 	struct tm *timeptr = NULL;
 	struct stat statbuf;
 	static int twice = -1;
@@ -1287,14 +1285,13 @@ nxtfile(int argc, char **argv, const cha
 			*fname = fnamedefault;
 		if (nohead)
 			return(inf);
-		if (gettimeofday(&tv, &tz) < 0) {
+		if ((tv_sec = time(NULL)) == -1) {
 			++errcnt;
 			(void)fprintf(err, "pr: cannot get time of day, %s\n",
 				strerror(errno));
 			eoptind = argc - 1;
 			return(NULL);
 		}
-		tv_sec = tv.tv_sec;
 		timeptr = localtime(&tv_sec);
 	}
 	for (; eoptind < argc; ++eoptind) {
@@ -1311,14 +1308,13 @@ nxtfile(int argc, char **argv, const cha
 			++eoptind;
 			if (nohead || (dt && twice))
 				return(inf);
-			if (gettimeofday(&tv, &tz) < 0) {
+			if ((tv_sec = time(NULL)) == -1) {
 				++errcnt;
 				(void)fprintf(err,
 					"pr: cannot get time of day, %s\n",
 					strerror(errno));
 				return(NULL);
 			}
-			tv_sec = tv.tv_sec;
 			timeptr = localtime(&tv_sec);
 		} else {
 			/*
@@ -1343,14 +1339,13 @@ nxtfile(int argc, char **argv, const cha
 				return(inf);
 
 			if (dt) {
-				if (gettimeofday(&tv, &tz) < 0) {
+				if ((tv_sec = time(NULL)) == -1) {
 					++errcnt;
 					(void)fprintf(err,
 					     "pr: cannot get time of day, %s\n",
 					     strerror(errno));
 					return(NULL);
 				}
-				tv_sec = tv.tv_sec;
 				timeptr = localtime(&tv_sec);
 			} else {
 				if (fstat(fileno(inf), &statbuf) < 0) {