From owner-p4-projects  Mon Nov 25 18:32:55 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6CA6237B404; Mon, 25 Nov 2002 18:32:52 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 047A737B401
	for <perforce@freebsd.org>; Mon, 25 Nov 2002 18:32:52 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B1C1E43EC5
	for <perforce@freebsd.org>; Mon, 25 Nov 2002 18:32:51 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQ2TKmV033843
	for <perforce@freebsd.org>; Mon, 25 Nov 2002 18:29:20 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQ2TKPg033840
	for perforce@freebsd.org; Mon, 25 Nov 2002 18:29:20 -0800 (PST)
Date: Mon, 25 Nov 2002 18:29:20 -0800 (PST)
Message-Id: <200211260229.gAQ2TKPg033840@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 21512 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=21512

Change 21512 by peter@peter_ia64 on 2002/11/25 18:29:00

	gah, forgot to back some stuff out of the last change.
	I had changed tm_year to 'long' to test the algorithms, which
	required changing tmcomp return value from int to long.

Affected files ...

.. //depot/projects/ia64/lib/libc/stdtime/localtime.c#8 edit

Differences ...

==== //depot/projects/ia64/lib/libc/stdtime/localtime.c#8 (text+ko) ====

@@ -149,7 +149,7 @@
 				long offset, int * okayp);
 static void		timesub(const time_t * timep, long offset,
 				const struct state * sp, struct tm * tmp);
-static long		tmcomp(const struct tm * atmp,
+static int		tmcomp(const struct tm * atmp,
 				const struct tm * btmp);
 static time_t		transtime(time_t janfirst, int year,
 				const struct rule * rulep, long offset);
@@ -1380,12 +1380,12 @@
 	return increment_overflow(tensptr, tensdelta);
 }
 
-static long
+static int
 tmcomp(atmp, btmp)
 const struct tm * const atmp;
 const struct tm * const btmp;
 {
-	long	result;
+	int	result;
 
 	if ((result = (atmp->tm_year - btmp->tm_year)) == 0 &&
 		(result = (atmp->tm_mon - btmp->tm_mon)) == 0 &&
@@ -1404,7 +1404,7 @@
 int * const		okayp;
 {
 	const struct state *	sp;
-	long			dir;
+	int			dir;
 	int			bits;
 	int			i, j ;
 	int			saved_seconds;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message