2000-07-31  H.J. Lu  <hjl@gnu.org>

	* sysdeps/generic/printf_fphex.c (__printf_fphex): Correctly
	handle the wchar_t array.
This commit is contained in:
Ulrich Drepper 2000-08-01 03:10:27 +00:00
parent b3cedb0912
commit a535ce141f
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2000-07-31 H.J. Lu <hjl@gnu.org>
* sysdeps/generic/printf_fphex.c (__printf_fphex): Correctly
handle the wchar_t array.
2000-07-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/gb18030.c: Don't map to and from positions in ISO

View File

@ -284,21 +284,21 @@ __printf_fphex (FILE *fp,
if (sizeof (unsigned long int) > 6)
{
wnumstr = _itowa_word (num, wnumbuf + sizeof wnumbuf, 16,
wnumstr = _itowa_word (num, wnumbuf + (sizeof wnumbuf) / sizeof (wchar_t), 16,
info->spec == 'A');
numstr = _itoa_word (num, numbuf + sizeof numbuf, 16,
info->spec == 'A');
}
else
{
wnumstr = _itowa (num, wnumbuf + sizeof wnumbuf, 16,
wnumstr = _itowa (num, wnumbuf + sizeof wnumbuf / sizeof (wchar_t), 16,
info->spec == 'A');
numstr = _itoa (num, numbuf + sizeof numbuf, 16,
info->spec == 'A');
}
/* Fill with zeroes. */
while (wnumstr > wnumbuf + (sizeof wnumbuf - 52 / 4))
while (wnumstr > wnumbuf + (sizeof wnumbuf - 52) / sizeof (wchar_t))
{
*--wnumstr = L'0';
*--numstr = '0';