Libc-763.11.tar.gz

[apple/libc.git] / stdio / sprintf-fbsd.c

diff --git a/stdio/sprintf-fbsd.c b/stdio/sprintf-fbsd.c
index 38d534eaed35c58f78b8ebc63e114215c7ea480b..f2cb3a959a214fdc67ee41938c88d732ce49bd55 100644 (file)
--- a/stdio/sprintf-fbsd.c
+++ b/stdio/sprintf-fbsd.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)sprintf.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.14 2002/09/06 11:23:55 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.16 2008/04/17 22:17:54 jhb Exp $");
 
 #include "xlocale_private.h"
 
@@ -52,19 +48,10 @@ sprintf(char * __restrict str, char const * __restrict fmt, ...)
 {
        int ret;
        va_list ap;
-       FILE f;
-       struct __sFILEX ext;
 
-       f._file = -1;
-       f._flags = __SWR | __SSTR;
-       f._bf._base = f._p = (unsigned char *)str;
-       f._bf._size = f._w = INT_MAX;
-       f._extra = &ext;
-       INITEXTRA(&f);
        va_start(ap, fmt);
-       ret = __vfprintf(&f, __current_locale(), fmt, ap);
+       ret = vsprintf_l(str, __current_locale(), fmt, ap);
        va_end(ap);
-       *f._p = 0;
        return (ret);
 }
 
@@ -73,19 +60,9 @@ sprintf_l(char * __restrict str, locale_t loc, char const * __restrict fmt, ...)
 {
        int ret;
        va_list ap;
-       FILE f;
-       struct __sFILEX ext;
 
-       NORMALIZE_LOCALE(loc);
-       f._file = -1;
-       f._flags = __SWR | __SSTR;
-       f._bf._base = f._p = (unsigned char *)str;
-       f._bf._size = f._w = INT_MAX;
-       f._extra = &ext;
-       INITEXTRA(&f);
        va_start(ap, fmt);
-       ret = __vfprintf(&f, loc, fmt, ap);
+       ret = vsprintf_l(str, loc, fmt, ap);
        va_end(ap);
-       *f._p = 0;
        return (ret);
 }