public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Marek Polacek <mpolacek@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6277] Avoid more -Wformat-diag warnings [PR103758] Date: Thu, 6 Jan 2022 00:42:59 +0000 (GMT) [thread overview] Message-ID: <20220106004259.DA45B3857C56@sourceware.org> (raw) https://gcc.gnu.org/g:1935db296892bbd9fc597889237528bd7e080ab1 commit r12-6277-g1935db296892bbd9fc597889237528bd7e080ab1 Author: Marek Polacek <polacek@redhat.com> Date: Wed Jan 5 17:53:30 2022 -0500 Avoid more -Wformat-diag warnings [PR103758] Let's use "%<x>, %<y>, or %<z>" 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 %<big-endian%>, %<little-endian%>, or %<default%> 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 %<big-endian%>, %<little-endian%>, or %<default%> 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 %<error%>, %<warning%>, %<ignored%>, %<push%>, " + "%<pop%>, or %<ignored_attributes%> 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 %<error%>, %<warning%>, %<ignored%>, %<push%>, " + "%<pop%>, %<ignored_attributes%> 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 };
reply other threads:[~2022-01-06 0:42 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220106004259.DA45B3857C56@sourceware.org \ --to=mpolacek@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).