From owner-svn-src-head@FreeBSD.ORG  Mon Dec 21 19:59:39 2009
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 4609B1065670;
	Mon, 21 Dec 2009 19:59:39 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 34AE78FC08;
	Mon, 21 Dec 2009 19:59:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBLJxdwo038988;
	Mon, 21 Dec 2009 19:59:39 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBLJxdfK038986;
	Mon, 21 Dec 2009 19:59:39 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200912211959.nBLJxdfK038986@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 21 Dec 2009 19:59:39 +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: r200802 - 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: Mon, 21 Dec 2009 19:59:39 -0000

Author: delphij
Date: Mon Dec 21 19:59:38 2009
New Revision: 200802
URL: http://svn.freebsd.org/changeset/base/200802

Log:
  Use vsprintf instead of rolling our own.
  
  PR:		bin/140496
  Submitted by:	Jeremy Huddleston <jeremyhu apple.com>
  MFC after:	1 month

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

Modified: head/lib/libc/stdio/sprintf.c
==============================================================================
--- head/lib/libc/stdio/sprintf.c	Mon Dec 21 19:56:11 2009	(r200801)
+++ head/lib/libc/stdio/sprintf.c	Mon Dec 21 19:59:38 2009	(r200802)
@@ -46,17 +46,9 @@ sprintf(char * __restrict str, char cons
 {
 	int ret;
 	va_list ap;
-	FILE f;
 
-	f._file = -1;
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = INT_MAX;
-	f._orientation = 0;
-	memset(&f._mbstate, 0, sizeof(mbstate_t));
 	va_start(ap, fmt);
-	ret = __vfprintf(&f, fmt, ap);
+	ret = vsprintf(str, fmt, ap);
 	va_end(ap);
-	*f._p = 0;
 	return (ret);
 }