Consolidate some variable initializations. No substantive change.

This commit is contained in:
das 2008-12-11 02:39:27 +00:00
parent 73a287aa0c
commit c1b028f516
2 changed files with 13 additions and 13 deletions

View File

@ -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).

View File

@ -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).