From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1734) id DA45B3857C56; Thu, 6 Jan 2022 00:42:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA45B3857C56 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marek Polacek To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6277] Avoid more -Wformat-diag warnings [PR103758] X-Act-Checkin: gcc X-Git-Author: Marek Polacek X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 0fbefa25b3f928d97fb7fd61f1448a55e5ec612d X-Git-Newrev: 1935db296892bbd9fc597889237528bd7e080ab1 Message-Id: <20220106004259.DA45B3857C56@sourceware.org> Date: Thu, 6 Jan 2022 00:42:59 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jan 2022 00:43:00 -0000 https://gcc.gnu.org/g:1935db296892bbd9fc597889237528bd7e080ab1 commit r12-6277-g1935db296892bbd9fc597889237528bd7e080ab1 Author: Marek Polacek Date: Wed Jan 5 17:53:30 2022 -0500 Avoid more -Wformat-diag warnings [PR103758] Let's use "%, %, or %" rather than "[x|y|z]" as in the rest of our codebase. PR c++/103758 gcc/c-family/ChangeLog: * c-pragma.c (handle_pragma_scalar_storage_order): Use %< %> in diagnostic messages. (handle_pragma_diagnostic): Likewise. gcc/testsuite/ChangeLog: * gcc.dg/sso-6.c: Update dg-warning. Diff: --- gcc/c-family/c-pragma.c | 16 ++++++++++------ gcc/testsuite/gcc.dg/sso-6.c | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c index ecf4457aacd..8dde5b841b2 100644 --- a/gcc/c-family/c-pragma.c +++ b/gcc/c-family/c-pragma.c @@ -441,7 +441,8 @@ handle_pragma_scalar_storage_order (cpp_reader *ARG_UNUSED(dummy)) token = pragma_lex (&x); if (token != CPP_NAME) - GCC_BAD ("missing [big-endian|little-endian|default] after %<#pragma scalar_storage_order%>"); + GCC_BAD ("missing %, %, or % after " + "%<#pragma scalar_storage_order%>"); kind_string = IDENTIFIER_POINTER (x); if (strcmp (kind_string, "default") == 0) global_sso = default_sso; @@ -450,7 +451,8 @@ handle_pragma_scalar_storage_order (cpp_reader *ARG_UNUSED(dummy)) else if (strcmp (kind_string, "little") == 0) global_sso = SSO_LITTLE_ENDIAN; else - GCC_BAD ("expected [big-endian|little-endian|default] after %<#pragma scalar_storage_order%>"); + GCC_BAD ("expected %, %, or % after " + "%<#pragma scalar_storage_order%>"); } /* GCC supports two #pragma directives for renaming the external @@ -771,8 +773,9 @@ handle_pragma_diagnostic(cpp_reader *ARG_UNUSED(dummy)) if (token != CPP_NAME) { warning_at (loc, OPT_Wpragmas, - "missing [error|warning|ignored|push|pop|ignored_attributes]" - " after %<#pragma GCC diagnostic%>"); + "missing %, %, %, %, " + "%, or % after " + "%<#pragma GCC diagnostic%>"); return; } @@ -830,8 +833,9 @@ handle_pragma_diagnostic(cpp_reader *ARG_UNUSED(dummy)) else { warning_at (loc, OPT_Wpragmas, - "expected [error|warning|ignored|push|pop|ignored_attributes]" - " after %<#pragma GCC diagnostic%>"); + "expected %, %, %, %, " + "%, % after " + "%<#pragma GCC diagnostic%>"); return; } diff --git a/gcc/testsuite/gcc.dg/sso-6.c b/gcc/testsuite/gcc.dg/sso-6.c index e955fa93686..559253293b5 100644 --- a/gcc/testsuite/gcc.dg/sso-6.c +++ b/gcc/testsuite/gcc.dg/sso-6.c @@ -3,7 +3,7 @@ /* { dg-do run } */ /* { dg-require-effective-target int32plus } */ -#pragma scalar_storage_order /* { dg-warning "missing .big-endian.little-endian.default." } */ +#pragma scalar_storage_order /* { dg-warning "missing .big-endian., .little-endian., or .default." } */ #pragma scalar_storage_order big-endian @@ -36,7 +36,7 @@ struct S5 int i; }; -#pragma scalar_storage_order other /* { dg-warning "expected .big-endian.little-endian.default." } */ +#pragma scalar_storage_order other /* { dg-warning "expected .big-endian., .little-endian., or .default." } */ struct S1 my_s1 = { 0x12345678 }; struct S2 my_s2 = { 0x12345678 };