Loading...
--- Libc/Libc-825.26/stdio/FreeBSD/vsnprintf.c
+++ Libc/Libc-320/stdio/FreeBSD/vsnprintf.c
@@ -13,6 +13,10 @@
* 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.
@@ -34,16 +38,14 @@
static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.24 2008/04/17 22:17:54 jhb Exp $");
-
-#include "xlocale_private.h"
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.22 2003/07/02 07:08:44 jkh Exp $");
#include <limits.h>
#include <stdio.h>
#include "local.h"
int
-vsnprintf_l(char * __restrict str, size_t n, locale_t loc, const char * __restrict fmt,
+vsnprintf(char * __restrict str, size_t n, const char * __restrict fmt,
__va_list ap)
{
size_t on;
@@ -51,10 +53,7 @@
char dummy[2];
FILE f;
struct __sFILEX ext;
- f._extra = &ext;
- INITEXTRA(&f);
- NORMALIZE_LOCALE(loc);
on = n;
if (n != 0)
n--;
@@ -71,17 +70,10 @@
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *)str;
f._bf._size = f._w = n;
- f._orientation = 0;
- memset(&f._mbstate, 0, sizeof(mbstate_t));
- ret = __vfprintf(&f, loc, fmt, ap);
+ f._extra = &ext;
+ INITEXTRA(&f);
+ ret = __vfprintf(&f, fmt, ap);
if (on > 0)
*f._p = '\0';
return (ret);
}
-
-int
-vsnprintf(char * __restrict str, size_t n, const char * __restrict fmt,
- __va_list ap)
-{
- return vsnprintf_l(str, n, __current_locale(), fmt, ap);
-}