This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
Hi!
Now that vfprintf always sets pa_int (resp. pa_double) instead of these
union members, we shouldn't read from them either.
Tested on ppc-linux.
2003-05-27 Jakub Jelinek <jakub@redhat.com>
* stdio-common/vfprintf.c (process_arg, process_string_arg): Use
pa_int/pa_u_int instead of pa_short_int, pa_u_short_int and pa_char.
* stdio-common/printf-parse.h (union printf_arg): Remove pa_char,
pa_short_int, pa_u_short_int and pa_float.
--- libc/stdio-common/vfprintf.c.jj 2003-05-26 09:44:31.000000000 -0400
+++ libc/stdio-common/vfprintf.c 2003-05-26 20:18:03.000000000 -0400
@@ -581,10 +581,8 @@ vfprintf (FILE *s, const CHAR_T *format,
else \
if (is_long_num) \
signed_number = args_value[fspec->data_arg].pa_long_int; \
- else if (!is_short) \
+ else /* `char' and `short int' will be promoted to `int'. */ \
signed_number = args_value[fspec->data_arg].pa_int; \
- else \
- signed_number = args_value[fspec->data_arg].pa_short_int; \
\
is_negative = signed_number < 0; \
number.word = is_negative ? (- signed_number) : signed_number; \
@@ -675,12 +673,12 @@ vfprintf (FILE *s, const CHAR_T *format,
number.word = args_value[fspec->data_arg].pa_u_long_int; \
else if (is_char) \
number.word = (unsigned char) \
- args_value[fspec->data_arg].pa_char; \
+ args_value[fspec->data_arg].pa_u_int; \
else if (!is_short) \
number.word = args_value[fspec->data_arg].pa_u_int; \
else \
number.word = (unsigned short int) \
- args_value[fspec->data_arg].pa_u_short_int; \
+ args_value[fspec->data_arg].pa_u_int; \
\
LABEL (number): \
if (prec < 0) \
@@ -977,7 +975,7 @@ vfprintf (FILE *s, const CHAR_T *format,
outchar (__btowc ((unsigned char) va_arg (ap, int))); /* Promoted. */ \
else \
outchar (__btowc ((unsigned char) \
- args_value[fspec->data_arg].pa_char)); \
+ args_value[fspec->data_arg].pa_int)); \
if (left) \
PAD (L' '); \
break; \
@@ -1096,7 +1094,7 @@ vfprintf (FILE *s, const CHAR_T *format,
if (fspec == NULL) \
outchar ((unsigned char) va_arg (ap, int)); /* Promoted. */ \
else \
- outchar ((unsigned char) args_value[fspec->data_arg].pa_char); \
+ outchar ((unsigned char) args_value[fspec->data_arg].pa_int); \
if (left) \
PAD (' '); \
break; \
--- libc/stdio-common/printf-parse.h.jj 2002-11-05 17:10:28.000000000 -0500
+++ libc/stdio-common/printf-parse.h 2003-05-26 20:14:46.000000000 -0400
@@ -51,17 +51,13 @@ struct printf_spec
/* The various kinds off arguments that can be passed to printf. */
union printf_arg
{
- unsigned char pa_char;
wchar_t pa_wchar;
- short int pa_short_int;
int pa_int;
long int pa_long_int;
long long int pa_long_long_int;
- unsigned short int pa_u_short_int;
unsigned int pa_u_int;
unsigned long int pa_u_long_int;
unsigned long long int pa_u_long_long_int;
- float pa_float;
double pa_double;
long double pa_long_double;
const char *pa_string;
Jakub
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |