From: Jason Merrill <jason@redhat.com>
Date: Thu, 22 May 2025 14:10:04 +0000 (-0400)
Subject: diagnostics: use -Wformat-diag more consistently
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32396d87b7d92aa2a89f3b2c09f4f1fe373f3ef0;p=thirdparty%2Fgcc.git

diagnostics: use -Wformat-diag more consistently

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.
---

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);
     }