JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct disposition of wchar_t output in printf().

Browse Source
This commit is contained in:
Keith Marshall 2009-07-29 07:22:51 +00:00
parent 7a92f0348c
commit 0c27cfc9b0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/mingw/ChangeLog
View File

@ -1,3 +1,11 @@
2009-07-29 Keith Marshall <keithmarshall@users.sourceforge.net>
Correct disposition of wchar_t output in printf().
mingwex/stdio/pformat.c (__pformat) [%C]: Create new instance of...
(argval): ...this, in inner scope, with singular type `wchar_t'; use
it to pass one wchar to __pformat_wputchars(), for output.
2009-07-27 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> 2009-07-27 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* mingwex/stdio/pformat.c: Implement better fix for type punned warning. * mingwex/stdio/pformat.c: Implement better fix for type punned warning.

7
winsup/mingw/mingwex/stdio/pformat.c
View File

@ -734,8 +734,7 @@ char *__pformat_cvt( int mode, __pformat_fpreg_t x, int nd, int *dp, int *sign )
* his `__gdtoa()' function in a manner to provide extended precision * his `__gdtoa()' function in a manner to provide extended precision
* replacements for `ecvt()' and `fcvt()'. * replacements for `ecvt()' and `fcvt()'.
*/ */
int k; int k; unsigned int e = 0; char *ep;
unsigned int e = 0; char *ep;
static FPI fpi = { 64, 1-16383-64+1, 32766-16383-64+1, FPI_Round_near, 0 }; static FPI fpi = { 64, 1-16383-64+1, 32766-16383-64+1, FPI_Round_near, 0 };
/* Classify the argument into an appropriate `__gdtoa()' category... /* Classify the argument into an appropriate `__gdtoa()' category...
@ -1882,8 +1881,8 @@ int __pformat( int flags, void *dest, int max, const char *fmt, va_list argv )
/* considering any `long' type modifier as a reference to /* considering any `long' type modifier as a reference to
* `wchar_t' data, (which is promoted to an `int' argument)... * `wchar_t' data, (which is promoted to an `int' argument)...
*/ */
argval.__pformat_ullong_t = (wchar_t)(va_arg( argv, int )); wchar_t argval = (wchar_t)(va_arg( argv, int ));
__pformat_wputchars( (wchar_t *)argval.__pformat_ptr_t, 1, &stream ); __pformat_wputchars( &argval, 1, &stream );
} }
else else