From c76f4e8ef47f7d4fea47af7a39edf1aae00ac977 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sat, 8 Nov 2003 22:42:00 +0000 Subject: re PR c/3190 (-Wformat-y2k doesn't belong to -Wall - it's hard to avoid) PR c/3190 PR c/8714 * c-format.c (set_Wformat): Do not enable -Wformat-y2k by default. * invoke.texi: Update. testsuite: PR c/3190 PR c/8714 * gcc.dg/format/c90-strftime-1.c, gcc.dg/format/c90-strftime-2.c, gcc.dg/format/c99-strftime-1.c, gcc.dg/format/ext3.c, gcc.dg/format/no-y2k-1.c: Update. From-SVN: r73378 --- gcc/ChangeLog | 7 +++++++ gcc/c-format.c | 2 +- gcc/doc/invoke.texi | 12 ++++++------ gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.dg/format/c90-strftime-1.c | 2 +- gcc/testsuite/gcc.dg/format/c90-strftime-2.c | 2 +- gcc/testsuite/gcc.dg/format/c99-strftime-1.c | 2 +- gcc/testsuite/gcc.dg/format/ext-3.c | 2 +- gcc/testsuite/gcc.dg/format/no-y2k-1.c | 4 ++-- 9 files changed, 28 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 60d7921..d045a70 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2003-11-08 Joseph S. Myers + + PR c/3190 + PR c/8714 + * c-format.c (set_Wformat): Do not enable -Wformat-y2k by default. + * invoke.texi: Update. + 2003-11-08 John David Anglin PR optimization/12630 diff --git a/gcc/c-format.c b/gcc/c-format.c index 82fb593..269be17 100644 --- a/gcc/c-format.c +++ b/gcc/c-format.c @@ -37,13 +37,13 @@ void set_Wformat (int setting) { warn_format = setting; - warn_format_y2k = setting; warn_format_extra_args = setting; warn_format_zero_length = setting; if (setting != 1) { warn_format_nonliteral = setting; warn_format_security = setting; + warn_format_y2k = setting; } /* Make sure not to disable -Wnonnull if -Wformat=0 is specified. */ if (setting) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index b430af6..a1c2d0b 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -218,7 +218,7 @@ in the following sections. -Werror -Werror-implicit-function-declaration @gol -Wfloat-equal -Wformat -Wformat=2 @gol -Wno-format-extra-args -Wformat-nonliteral @gol --Wformat-security -Wno-format-y2k @gol +-Wformat-security -Wformat-y2k @gol -Wimplicit -Wimplicit-function-declaration -Wimplicit-int @gol -Wimport -Wno-import -Winit-self -Winline @gol -Wno-invalid-offsetof -Winvalid-pch @gol @@ -2125,14 +2125,14 @@ Since @option{-Wformat} also checks for null format arguments for several functions, @option{-Wformat} also implies @option{-Wnonnull}. @option{-Wformat} is included in @option{-Wall}. For more control over some -aspects of format checking, the options @option{-Wno-format-y2k}, +aspects of format checking, the options @option{-Wformat-y2k}, @option{-Wno-format-extra-args}, @option{-Wno-format-zero-length}, @option{-Wformat-nonliteral}, @option{-Wformat-security}, and @option{-Wformat=2} are available, but are not included in @option{-Wall}. -@item -Wno-format-y2k -@opindex Wno-format-y2k -If @option{-Wformat} is specified, do not warn about @code{strftime} +@item -Wformat-y2k +@opindex Wformat-y2k +If @option{-Wformat} is specified, also warn about @code{strftime} formats which may yield only a two-digit year. @item -Wno-format-extra-args @@ -2176,7 +2176,7 @@ included in @option{-Wformat-nonliteral}.) @opindex Wformat=2 Enable @option{-Wformat} plus format checks not included in @option{-Wformat}. Currently equivalent to @samp{-Wformat --Wformat-nonliteral -Wformat-security}. +-Wformat-nonliteral -Wformat-security -Wformat-y2k}. @item -Wnonnull @opindex Wnonnull diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index edc3de9..587bfdd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2003-11-08 Joseph S. Myers + + PR c/3190 + PR c/8714 + * gcc.dg/format/c90-strftime-1.c, gcc.dg/format/c90-strftime-2.c, + gcc.dg/format/c99-strftime-1.c, gcc.dg/format/ext3.c, + gcc.dg/format/no-y2k-1.c: Update. + 2003-11-08 Roger Sayle PR optimization/10467 diff --git a/gcc/testsuite/gcc.dg/format/c90-strftime-1.c b/gcc/testsuite/gcc.dg/format/c90-strftime-1.c index 0d75e91..1739f7b 100644 --- a/gcc/testsuite/gcc.dg/format/c90-strftime-1.c +++ b/gcc/testsuite/gcc.dg/format/c90-strftime-1.c @@ -1,7 +1,7 @@ /* Test for strftime formats. Formats using C90 features. */ /* Origin: Joseph Myers */ /* { dg-do compile } */ -/* { dg-options "-std=iso9899:1990 -pedantic -Wformat" } */ +/* { dg-options "-std=iso9899:1990 -pedantic -Wformat -Wformat-y2k" } */ #include "format.h" diff --git a/gcc/testsuite/gcc.dg/format/c90-strftime-2.c b/gcc/testsuite/gcc.dg/format/c90-strftime-2.c index 9742e44..8b8398e 100644 --- a/gcc/testsuite/gcc.dg/format/c90-strftime-2.c +++ b/gcc/testsuite/gcc.dg/format/c90-strftime-2.c @@ -2,7 +2,7 @@ pedantic C90 mode. */ /* Origin: Joseph Myers */ /* { dg-do compile } */ -/* { dg-options "-std=iso9899:1990 -pedantic -Wformat" } */ +/* { dg-options "-std=iso9899:1990 -pedantic -Wformat -Wformat-y2k" } */ #include "format.h" diff --git a/gcc/testsuite/gcc.dg/format/c99-strftime-1.c b/gcc/testsuite/gcc.dg/format/c99-strftime-1.c index a643d29..1730738 100644 --- a/gcc/testsuite/gcc.dg/format/c99-strftime-1.c +++ b/gcc/testsuite/gcc.dg/format/c99-strftime-1.c @@ -1,7 +1,7 @@ /* Test for strftime formats. Formats using C99 features. */ /* Origin: Joseph Myers */ /* { dg-do compile } */ -/* { dg-options "-std=iso9899:1999 -pedantic -Wformat" } */ +/* { dg-options "-std=iso9899:1999 -pedantic -Wformat -Wformat-y2k" } */ #include "format.h" diff --git a/gcc/testsuite/gcc.dg/format/ext-3.c b/gcc/testsuite/gcc.dg/format/ext-3.c index e71731e..937e112 100644 --- a/gcc/testsuite/gcc.dg/format/ext-3.c +++ b/gcc/testsuite/gcc.dg/format/ext-3.c @@ -3,7 +3,7 @@ */ /* Origin: Joseph Myers */ /* { dg-do compile } */ -/* { dg-options "-std=gnu99 -Wformat" } */ +/* { dg-options "-std=gnu99 -Wformat -Wformat-y2k" } */ #include "format.h" diff --git a/gcc/testsuite/gcc.dg/format/no-y2k-1.c b/gcc/testsuite/gcc.dg/format/no-y2k-1.c index ee68cd6..4dfd5a0 100644 --- a/gcc/testsuite/gcc.dg/format/no-y2k-1.c +++ b/gcc/testsuite/gcc.dg/format/no-y2k-1.c @@ -1,7 +1,7 @@ -/* Test for warnings for Y2K problems being disabled by -Wno-format-y2k. */ +/* Test for warnings for Y2K problems not being on by default. */ /* Origin: Joseph Myers */ /* { dg-do compile } */ -/* { dg-options "-std=gnu99 -Wformat -Wno-format-y2k" } */ +/* { dg-options "-std=gnu99 -Wformat" } */ #include "format.h" -- cgit v1.1