diff options
| author | das <das@FreeBSD.org> | 2008-12-11 02:39:27 +0000 |
|---|---|---|
| committer | das <das@FreeBSD.org> | 2008-12-11 02:39:27 +0000 |
| commit | c1b028f5165a61900389f1ea4d054ab348579192 (patch) | |
| tree | 6e99a3ae7323227be3ce211f3ccfd22e63ff454a /lib/libc/stdio | |
| parent | 73a287aa0ca874c2faef800470bc8d1e04f602cd (diff) | |
| download | FreeBSD-src-c1b028f5165a61900389f1ea4d054ab348579192.zip FreeBSD-src-c1b028f5165a61900389f1ea4d054ab348579192.tar.gz | |
Consolidate some variable initializations. No substantive change.
Diffstat (limited to 'lib/libc/stdio')
| -rw-r--r-- | lib/libc/stdio/vfprintf.c | 14 | ||||
| -rw-r--r-- | lib/libc/stdio/vfwprintf.c | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index cb70245..dab331d 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -567,13 +567,6 @@ __vfprintf(FILE *fp, const char *fmt0, va_list ap) if (__use_xprintf > 0) return (__xvprintf(fp, fmt0, ap)); - thousands_sep = '\0'; - grouping = NULL; - convbuf = NULL; -#ifndef NO_FLOATING_POINT - dtoaresult = NULL; - decimal_point = localeconv()->decimal_point; -#endif /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */ if (prepwrite(fp) != 0) return (EOF); @@ -583,6 +576,9 @@ __vfprintf(FILE *fp, const char *fmt0, va_list ap) fp->_file >= 0) return (__sbprintf(fp, fmt0, ap)); + thousands_sep = '\0'; + grouping = NULL; + convbuf = NULL; fmt = (char *)fmt0; argtable = NULL; nextarg = 1; @@ -591,6 +587,10 @@ __vfprintf(FILE *fp, const char *fmt0, va_list ap) uio.uio_resid = 0; uio.uio_iovcnt = 0; ret = 0; +#ifndef NO_FLOATING_POINT + dtoaresult = NULL; + decimal_point = localeconv()->decimal_point; +#endif /* * Scan the format for conversions (`%' character). diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index dcd0f14..9f06f1b 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -575,12 +575,6 @@ __vfwprintf(FILE *fp, const wchar_t *fmt0, va_list ap) } - thousands_sep = '\0'; - grouping = NULL; -#ifndef NO_FLOATING_POINT - decimal_point = localeconv()->decimal_point; -#endif - convbuf = NULL; /* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */ if (prepwrite(fp) != 0) return (EOF); @@ -590,11 +584,17 @@ __vfwprintf(FILE *fp, const wchar_t *fmt0, va_list ap) fp->_file >= 0) return (__sbprintf(fp, fmt0, ap)); + thousands_sep = '\0'; + grouping = NULL; + convbuf = NULL; fmt = (wchar_t *)fmt0; argtable = NULL; nextarg = 1; va_copy(orgap, ap); ret = 0; +#ifndef NO_FLOATING_POINT + decimal_point = localeconv()->decimal_point; +#endif /* * Scan the format for conversions (`%' character). |
