On Thu, 2025-05-22 at 17:01 -0400, Jason Merrill wrote:
> Tested x86_64-pc-linux-gnu, any objection?
LGTM
Thanks
Dave
>
> -- 8< --
>
> r10-1211 added various -Wformat-diag warnings about quoting in GCC
> diagnostic strings, but didn't change these two quoting warnings to
> use that
> flag as well.
>
> gcc/c-family/ChangeLog:
>
> * c-format.cc (flag_chars_t::validate): Control quoting
> warnings
> with -Wformat-diag.
> ---
> gcc/c-family/c-format.cc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gcc/c-family/c-format.cc b/gcc/c-family/c-format.cc
> index 211d20dd25b..a44249a0222 100644
> --- a/gcc/c-family/c-format.cc
> +++ b/gcc/c-family/c-format.cc
> @@ -2124,7 +2124,7 @@ flag_chars_t::validate (const format_kind_info
> *fki,
> {
> format_warning_at_char (format_string_loc,
> format_string_cst,
> format_chars - orig_format_chars -
> 1,
> - OPT_Wformat_,
> + OPT_Wformat_diag,
> "%s used within a quoted
> sequence",
> _(s->name));
> }
> @@ -2137,7 +2137,7 @@ flag_chars_t::validate (const format_kind_info
> *fki,
> {
> format_warning_at_char (format_string_loc, format_string_cst,
> format_chars - orig_format_chars,
> - OPT_Wformat_,
> + OPT_Wformat_diag,
> "%qc conversion used unquoted",
> format_char);
> }
>
> base-commit: f5016d8492e4067faef2f9403370a4b49f7a3898
