svn commit: r185825 - head/lib/libc/stdio

[David Schultz]

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;