AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #2509]

Browse Source 
* stdio-common/vfprintf.c (process_arg): Fix reading of signed
	short and byte values from parameter list.
	* stdio-common/tst-printf.c (main): Add more tests.
	* stdio-common/tst-printf.sh: Adjust for tst-printf.c change.
This commit is contained in:
Ulrich Drepper 2006-05-02 20:28:05 +00:00
parent 1863d841f5
commit d2dc7b0816
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2006-05-02 Ulrich Drepper <drepper@redhat.com> 2006-05-02 Ulrich Drepper <drepper@redhat.com>
[BZ #2509]
* stdio-common/vfprintf.c (process_arg): Fix reading of signed
short and byte values from parameter list.
* stdio-common/tst-printf.c (main): Add more tests.
* stdio-common/tst-printf.sh: Adjust for tst-printf.c change.
* iconvdata/testdate/MIK: Fix format to match expected output. * iconvdata/testdate/MIK: Fix format to match expected output.
[BZ #2632] [BZ #2632]

11
stdio-common/tst-printf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,93,95,96,97,98,99, 2000, 2002 /* Copyright (C) 1991,92,93,95,96,97,98,99, 2000, 2002, 2006
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -273,6 +273,15 @@ I am ready for my first lesson today.";
printf ("printf (\"%%hhu\", %u) = %hhu\n", UCHAR_MAX + 2, UCHAR_MAX + 2); printf ("printf (\"%%hhu\", %u) = %hhu\n", UCHAR_MAX + 2, UCHAR_MAX + 2);
printf ("printf (\"%%hu\", %u) = %hu\n", USHRT_MAX + 2, USHRT_MAX + 2); printf ("printf (\"%%hu\", %u) = %hu\n", USHRT_MAX + 2, USHRT_MAX + 2);
printf ("printf (\"%%hhi\", %i) = %hhi\n", UCHAR_MAX + 2, UCHAR_MAX + 2);
printf ("printf (\"%%hi\", %i) = %hi\n", USHRT_MAX + 2, USHRT_MAX + 2);
printf ("printf (\"%%1$hhu\", %2$u) = %1$hhu\n",
UCHAR_MAX + 2, UCHAR_MAX + 2);
printf ("printf (\"%%1$hu\", %2$u) = %1$hu\n", USHRT_MAX + 2, USHRT_MAX + 2);
printf ("printf (\"%%1$hhi\", %2$i) = %1$hhi\n",
UCHAR_MAX + 2, UCHAR_MAX + 2);
printf ("printf (\"%%1$hi\", %2$i) = %1$hi\n", USHRT_MAX + 2, USHRT_MAX + 2);
puts ("--- Should be no further output. ---"); puts ("--- Should be no further output. ---");
rfg1 (); rfg1 ();

6
stdio-common/tst-printf.sh
View File

@ -246,6 +246,12 @@ Test ok.
sprintf (buf, "%07Lo", 040000000000ll) = 40000000000 sprintf (buf, "%07Lo", 040000000000ll) = 40000000000
printf ("%hhu", 257) = 1 printf ("%hhu", 257) = 1
printf ("%hu", 65537) = 1 printf ("%hu", 65537) = 1
printf ("%hhi", 257) = 1
printf ("%hi", 65537) = 1
printf ("%1$hhu", 257) = 1
printf ("%1$hu", 65537) = 1
printf ("%1$hhi", 257) = 1
printf ("%1$hi", 65537) = 1
--- Should be no further output. --- --- Should be no further output. ---
EOF EOF
cmp - ${common_objpfx}stdio-common/tst-printf.out > /dev/null 2>&1 || cmp - ${common_objpfx}stdio-common/tst-printf.out > /dev/null 2>&1 ||

14
stdio-common/vfprintf.c
View File

@ -530,14 +530,24 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
{ \ { \
if (is_long_num) \ if (is_long_num) \
signed_number = va_arg (ap, long int); \ signed_number = va_arg (ap, long int); \
else /* `char' and `short int' will be promoted to `int'. */ \ else if (is_char) \
signed_number = (signed char) va_arg (ap, unsigned int); \
else if (!is_short) \
signed_number = va_arg (ap, int); \ signed_number = va_arg (ap, int); \
else \
signed_number = (short int) va_arg (ap, unsigned int); \
} \ } \
else \ else \
if (is_long_num) \ if (is_long_num) \
signed_number = args_value[fspec->data_arg].pa_long_int; \ signed_number = args_value[fspec->data_arg].pa_long_int; \
else /* `char' and `short int' will be promoted to `int'. */ \ else if (is_char) \
signed_number = (signed char) \
args_value[fspec->data_arg].pa_u_int; \
else if (!is_short) \
signed_number = args_value[fspec->data_arg].pa_int; \ signed_number = args_value[fspec->data_arg].pa_int; \
else \
signed_number = (short int) \
args_value[fspec->data_arg].pa_u_int; \
\ \
is_negative = signed_number < 0; \ is_negative = signed_number < 0; \
number.word = is_negative ? (- signed_number) : signed_number; \ number.word = is_negative ? (- signed_number) : signed_number; \