From owner-svn-src-user@FreeBSD.ORG  Thu Dec 11 07:02:31 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3529C1065675;
	Thu, 11 Dec 2008 07:02:31 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 264858FC12;
	Thu, 11 Dec 2008 07:02:31 +0000 (UTC)
	(envelope-from kmacy@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 mBB72UIV057388;
	Thu, 11 Dec 2008 07:02:30 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBB72UCk057387;
	Thu, 11 Dec 2008 07:02:30 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812110702.mBB72UCk057387@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 11 Dec 2008 07:02:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185917 - user/kmacy/HEAD_fast_multi_xmit/lib/libc/stdio
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Dec 2008 07:02:31 -0000

Author: kmacy
Date: Thu Dec 11 07:02:30 2008
New Revision: 185917
URL: http://svn.freebsd.org/changeset/base/185917

Log:
  merge apparent vfprintf change

Modified:
  user/kmacy/HEAD_fast_multi_xmit/lib/libc/stdio/vfprintf.c

Modified: user/kmacy/HEAD_fast_multi_xmit/lib/libc/stdio/vfprintf.c
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/lib/libc/stdio/vfprintf.c	Thu Dec 11 07:01:48 2008	(r185916)
+++ user/kmacy/HEAD_fast_multi_xmit/lib/libc/stdio/vfprintf.c	Thu Dec 11 07:02:30 2008	(r185917)
@@ -396,6 +396,12 @@ __vfprintf(FILE *fp, const char *fmt0, v
 	char sign;		/* sign prefix (' ', '+', '-', or \0) */
 	char thousands_sep;	/* locale specific thousands separator */
 	const char *grouping;	/* locale specific numeric grouping rules */
+
+	if (__use_xprintf == 0 && getenv("USE_XPRINTF"))
+		__use_xprintf = 1;
+	if (__use_xprintf > 0)
+		return (__xvprintf(fp, fmt0, ap));
+
 #ifndef NO_FLOATING_POINT
 	/*
 	 * We can decompose the printed representation of floating
@@ -562,10 +568,6 @@ __vfprintf(FILE *fp, const char *fmt0, v
 		val = GETARG (int); \
 	}
 
-	if (__use_xprintf == 0 && getenv("USE_XPRINTF"))
-		__use_xprintf = 1;
-	if (__use_xprintf > 0)
-		return (__xvprintf(fp, fmt0, ap));
 
 	thousands_sep = '\0';
 	grouping = NULL;