diff options
author | Jakub Jelinek <jakub@redhat.com> | 2006-05-05 06:11:55 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2006-05-05 06:11:55 +0000 |
commit | 3f898a85fc15daad530ca7db852e7d724e3914b5 (patch) | |
tree | aea4ca88f192663618dacf8b3fb9e7f5f1fe527b /stdio-common/vfprintf.c | |
parent | baba5d9461d4e8a581ac26fe4412ad783ffc73e7 (diff) |
Updated to fedora-glibc-20060505T0554cvs/fedora-glibc-2_4_90-5
Diffstat (limited to 'stdio-common/vfprintf.c')
-rw-r--r-- | stdio-common/vfprintf.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index eb11ac2806..53339f3078 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -530,14 +530,24 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) { \ if (is_long_num) \ 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); \ + else \ + signed_number = (short int) va_arg (ap, unsigned int); \ } \ else \ if (is_long_num) \ 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; \ + else \ + signed_number = (short int) \ + args_value[fspec->data_arg].pa_u_int; \ \ is_negative = signed_number < 0; \ number.word = is_negative ? (- signed_number) : signed_number; \ |