From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5397 invoked by alias); 27 May 2003 07:30:45 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 5307 invoked from network); 27 May 2003 07:30:43 -0000 Received: from unknown (HELO localhost.localdomain) (195.113.19.66) by sources.redhat.com with SMTP; 27 May 2003 07:30:43 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by localhost.localdomain (8.12.8/8.12.8) with ESMTP id h4R7UfqO031392; Tue, 27 May 2003 09:30:41 +0200 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id h4R7UeEm031390; Tue, 27 May 2003 09:30:40 +0200 Date: Tue, 27 May 2003 07:30:00 -0000 From: Jakub Jelinek To: Ulrich Drepper , Roland McGrath Cc: Glibc hackers Subject: [PATCH] Remove pa_char, pa_short_int, pa_u_short_int and pa_float Message-ID: <20030527073040.GD24872@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i X-SW-Source: 2003-05/txt/msg00033.txt.bz2 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 * 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