From owner-svn-src-all@FreeBSD.ORG  Tue Jun 23 22:28:45 2009
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 72D5F1065679;
	Tue, 23 Jun 2009 22:28:45 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6108A8FC1E;
	Tue, 23 Jun 2009 22:28:45 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5NMSjEd092837;
	Tue, 23 Jun 2009 22:28:45 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5NMSjH8092835;
	Tue, 23 Jun 2009 22:28:45 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200906232228.n5NMSjH8092835@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 23 Jun 2009 22:28:45 +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: r194783 - head/lib/libc/stdtime
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: Tue, 23 Jun 2009 22:28:46 -0000

Author: edwin
Date: Tue Jun 23 22:28:44 2009
New Revision: 194783
URL: http://svn.freebsd.org/changeset/base/194783

Log:
  Remove duplicate if-statement on gmt_is_set in gmtsub().
  
  MFC after:	1 week

Modified:
  head/lib/libc/stdtime/localtime.c

Modified: head/lib/libc/stdtime/localtime.c
==============================================================================
--- head/lib/libc/stdtime/localtime.c	Tue Jun 23 22:22:20 2009	(r194782)
+++ head/lib/libc/stdtime/localtime.c	Tue Jun 23 22:28:44 2009	(r194783)
@@ -1472,18 +1472,16 @@ struct tm * const	tmp;
 {
 	register struct tm *	result;
 
+	_MUTEX_LOCK(&gmt_mutex);
 	if (!gmt_is_set) {
-		_MUTEX_LOCK(&gmt_mutex);
-		if (!gmt_is_set) {
 #ifdef ALL_STATE
-			gmtptr = (struct state *) malloc(sizeof *gmtptr);
-			if (gmtptr != NULL)
+		gmtptr = (struct state *) malloc(sizeof *gmtptr);
+		if (gmtptr != NULL)
 #endif /* defined ALL_STATE */
-				gmtload(gmtptr);
-			gmt_is_set = TRUE;
-		}
-		_MUTEX_UNLOCK(&gmt_mutex);
+			gmtload(gmtptr);
+		gmt_is_set = TRUE;
 	}
+	_MUTEX_UNLOCK(&gmt_mutex);
 	result = timesub(timep, offset, gmtptr, tmp);
 #ifdef TM_ZONE
 	/*