From a339bdeac0ab20e5fd4ded75b16ea5651bc9ef5b Mon Sep 17 00:00:00 2001 From: davek Date: Thu, 14 May 2009 00:59:33 +0000 Subject: [PATCH] * config/i386/msformat-c.c (ms_printf_length_specs): Use enumeration values even in sentinel and empty entries. (ms_printf_flag_specs): Likewise. (ms_scanf_flag_specs): Likewise. (ms_strftime_flag_specs): Likewise. (ms_print_char_table): Likewise. (ms_scan_char_table): Likewise. (ms_time_char_table): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@147513 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 11 +++++++++++ gcc/config/i386/msformat-c.c | 24 ++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 52ae15283af..ea12e83dd2c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2009-05-14 Dave Korn + + * config/i386/msformat-c.c (ms_printf_length_specs): Use enumeration + values even in sentinel and empty entries. + (ms_printf_flag_specs): Likewise. + (ms_scanf_flag_specs): Likewise. + (ms_strftime_flag_specs): Likewise. + (ms_print_char_table): Likewise. + (ms_scan_char_table): Likewise. + (ms_time_char_table): Likewise. + 2009-05-13 Doug Kwan * tree-ssa-sccvn.c (compare_ops): Stabilize qsort. diff --git a/gcc/config/i386/msformat-c.c b/gcc/config/i386/msformat-c.c index 4648c8d582b..dec8f40d478 100644 --- a/gcc/config/i386/msformat-c.c +++ b/gcc/config/i386/msformat-c.c @@ -36,12 +36,12 @@ along with GCC; see the file COPYING3. If not see static format_length_info ms_printf_length_specs[] = { - { "h", FMT_LEN_h, STD_C89, NULL, 0, 0 }, - { "l", FMT_LEN_l, STD_C89, NULL, 0, 0 }, - { "I32", FMT_LEN_l, STD_EXT, NULL, 0, 0 }, - { "I64", FMT_LEN_ll, STD_EXT, NULL, 0, 0 }, - { "I", FMT_LEN_L, STD_EXT, NULL, 0, 0 }, - { NULL, 0, 0, NULL, 0, 0 } + { "h", FMT_LEN_h, STD_C89, NULL, FMT_LEN_none, STD_C89 }, + { "l", FMT_LEN_l, STD_C89, NULL, FMT_LEN_none, STD_C89 }, + { "I32", FMT_LEN_l, STD_EXT, NULL, FMT_LEN_none, STD_C89 }, + { "I64", FMT_LEN_ll, STD_EXT, NULL, FMT_LEN_none, STD_C89 }, + { "I", FMT_LEN_L, STD_EXT, NULL, FMT_LEN_none, STD_C89 }, + { NULL, FMT_LEN_none, STD_C89, NULL, FMT_LEN_none, STD_C89 } }; static const format_flag_spec ms_printf_flag_specs[] = @@ -55,7 +55,7 @@ static const format_flag_spec ms_printf_flag_specs[] = { 'w', 0, 0, N_("field width"), N_("field width in printf format"), STD_C89 }, { 'p', 0, 0, N_("precision"), N_("precision in printf format"), STD_C89 }, { 'L', 0, 0, N_("length modifier"), N_("length modifier in printf format"), STD_C89 }, - { 0, 0, 0, NULL, NULL, 0 } + { 0, 0, 0, NULL, NULL, STD_C89 } }; static const format_flag_pair ms_printf_flag_pairs[] = @@ -72,7 +72,7 @@ static const format_flag_spec ms_scanf_flag_specs[] = { 'w', 0, 0, N_("field width"), N_("field width in scanf format"), STD_C89 }, { 'L', 0, 0, N_("length modifier"), N_("length modifier in scanf format"), STD_C89 }, { '\'', 0, 0, N_("''' flag"), N_("the ''' scanf flag"), STD_EXT }, - { 0, 0, 0, NULL, NULL, 0 } + { 0, 0, 0, NULL, NULL, STD_C89 } }; static const format_flag_pair ms_scanf_flag_pairs[] = @@ -84,7 +84,7 @@ static const format_flag_pair ms_scanf_flag_pairs[] = static const format_flag_spec ms_strftime_flag_specs[] = { { '#', 0, 0, N_("'#' flag"), N_("the '#' strftime flag"), STD_EXT }, - { 0, 0, 0, NULL, NULL, 0 } + { 0, 0, 0, NULL, NULL, STD_C89 } }; static const format_flag_pair ms_strftime_flag_pairs[] = @@ -107,7 +107,7 @@ static const format_char_info ms_print_char_table[] = /* X/Open conversion specifiers. */ { "C", 0, STD_EXT, { TEX_WI, BADLEN, T89_S, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL }, { "S", 1, STD_EXT, { TEX_W, BADLEN, T89_S, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "R", NULL }, - { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL } + { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL } }; static const format_char_info ms_scan_char_table[] = @@ -125,7 +125,7 @@ static const format_char_info ms_scan_char_table[] = /* X/Open conversion specifiers. */ { "C", 1, STD_EXT, { TEX_W, BADLEN, T89_S, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*w", "W", NULL }, { "S", 1, STD_EXT, { TEX_W, BADLEN, T89_S, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "*aw", "W", NULL }, - { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL } + { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL } }; static const format_char_info ms_time_char_table[] = @@ -142,7 +142,7 @@ static const format_char_info ms_time_char_table[] = { "%", 0, STD_C89, NOLENGTHS, "", "", NULL }, /* C99 conversion specifiers. */ { "z", 0, STD_C99, NOLENGTHS, "#", "", NULL }, - { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL } + { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL } }; const format_kind_info mingw_format_attributes[3] = -- 2.11.0