From owner-svn-src-head@FreeBSD.ORG  Wed Dec 10 02:32:06 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D7D871065672;
	Wed, 10 Dec 2008 02:32:06 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C3DCA8FC08;
	Wed, 10 Dec 2008 02:32:06 +0000 (UTC) (envelope-from das@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 mBA2W6Gi010402;
	Wed, 10 Dec 2008 02:32:06 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBA2W6i0010401;
	Wed, 10 Dec 2008 02:32:06 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200812100232.mBA2W6i0010401@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Wed, 10 Dec 2008 02:32:06 +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: r185825 - head/lib/libc/stdio
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2008 02:32:07 -0000

Author: das
Date: Wed Dec 10 02:32:06 2008
New Revision: 185825
URL: http://svn.freebsd.org/changeset/base/185825

Log:
  Move the xprintf hook to where it belongs; it shouldn't be in the
  middle of vfprintf's variable declarations.

Modified:
  head/lib/libc/stdio/vfprintf.c

Modified: head/lib/libc/stdio/vfprintf.c
==============================================================================
--- head/lib/libc/stdio/vfprintf.c	Wed Dec 10 02:24:50 2008	(r185824)
+++ head/lib/libc/stdio/vfprintf.c	Wed Dec 10 02:32:06 2008	(r185825)
@@ -396,12 +396,6 @@ __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
@@ -568,6 +562,10 @@ __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;