Libc-763.11.tar.gz

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

diff --git a/stdio/FreeBSD/sprintf.c b/stdio/FreeBSD/sprintf.c
index 6b9ed994fb887fd9a27dbdaf7dc722a6cc481430..005d300894574c8f613ea81efd899c606ff441f0 100644 (file)
--- a/stdio/FreeBSD/sprintf.c
+++ b/stdio/FreeBSD/sprintf.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.
  * 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.
  * 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>
 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 <stdio.h>
 #include <stdarg.h>
 
 #include <stdio.h>
 #include <stdarg.h>


@@ -51,14 +47,13 @@ sprintf(char * __restrict str, char const * __restrict fmt, ...)
        int ret;
        va_list ap;
        FILE f;
        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._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);
+       f._orientation = 0;
+       memset(&f._mbstate, 0, sizeof(mbstate_t));

        va_start(ap, fmt);
        ret = __vfprintf(&f, fmt, ap);
        va_end(ap);
        va_start(ap, fmt);
        ret = __vfprintf(&f, fmt, ap);
        va_end(ap);