Libc-763.11.tar.gz

[apple/libc.git] / stdio / FreeBSD / snprintf.c

diff --git a/stdio/FreeBSD/snprintf.c b/stdio/FreeBSD/snprintf.c
index b381852818c370f98d77ba3e1f522b9b39e33e5f..61d9c8a31ea65e479c13afa0362be71a6c8a30f7 100644 (file)
--- a/stdio/FreeBSD/snprintf.c
+++ b/stdio/FreeBSD/snprintf.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[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.20 2002/09/06 11:23:55 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.22 2008/04/17 22:17:54 jhb Exp $");
 
 #include <limits.h>
 #include <stdio.h>
@@ -53,7 +49,6 @@ snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...)
        int ret;
        va_list ap;
        FILE f;
-       struct __sFILEX ext;
 
        on = n;
        if (n != 0)
@@ -65,8 +60,8 @@ snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...)
        f._flags = __SWR | __SSTR;
        f._bf._base = f._p = (unsigned char *)str;
        f._bf._size = f._w = n;
-       f._extra = &ext;
-       INITEXTRA(&f);
+       f._orientation = 0;
+       memset(&f._mbstate, 0, sizeof(mbstate_t));
        ret = __vfprintf(&f, fmt, ap);
        if (on > 0)
                *f._p = '\0';