Libc-1081.1.3.tar.gz

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

diff --git a/stdio/FreeBSD/vasprintf.c b/stdio/FreeBSD/vasprintf.c
index d872a9e136ff03c1bb849e7ef57c2b54d1b104fb..81f5172d4708d1ac0ffd109fcf10b0b923d92f2b 100644 (file)
--- a/stdio/FreeBSD/vasprintf.c
+++ b/stdio/FreeBSD/vasprintf.c
@@ -37,12 +37,8 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.19 2008/04/17 22:17:54 jh
 #include <errno.h>
 #include "local.h"
 
-int
-vasprintf_l(str, loc, fmt, ap)
-       char **str;
-       locale_t loc;
-       const char *fmt;
-       __va_list ap;
+__private_extern__ int
+_vasprintf(printf_comp_t __restrict pc, printf_domain_t __restrict domain, char ** __restrict str, locale_t __restrict loc, const char * __restrict fmt, __va_list ap)
 {
        int ret;
        FILE f;
@@ -50,7 +46,6 @@ vasprintf_l(str, loc, fmt, ap)
        f._extra = &ext;
        INITEXTRA(&f);
        
-       NORMALIZE_LOCALE(loc);
        f._file = -1;
        f._flags = __SWR | __SSTR | __SALC;
        f._bf._base = f._p = (unsigned char *)malloc(128);
@@ -62,7 +57,7 @@ vasprintf_l(str, loc, fmt, ap)
        f._bf._size = f._w = 127;               /* Leave room for the NUL */
        f._orientation = 0;
        memset(&f._mbstate, 0, sizeof(mbstate_t));
-       ret = __vfprintf(&f, loc, fmt, ap);
+       ret = __v2printf(pc, domain, &f, loc, fmt, ap);
        if (ret < 0) {
                free(f._bf._base);
                *str = NULL;
@@ -75,10 +70,13 @@ vasprintf_l(str, loc, fmt, ap)
 }
 
 int
-vasprintf(str, fmt, ap)
-       char **str;
-       const char *fmt;
-       __va_list ap;
+vasprintf_l(char ** __restrict str, locale_t __restrict loc, const char * __restrict fmt, __va_list ap)
+{
+       return _vasprintf(XPRINTF_PLAIN, NULL, str, loc, fmt, ap);
+}
+
+int
+vasprintf(char ** __restrict str, const char * __restrict fmt, __va_list ap)
 {
-       return vasprintf_l(str, __current_locale(), fmt, ap);
+       return _vasprintf(XPRINTF_PLAIN, NULL, str, __current_locale(), fmt, ap);
 }