diff options
author | Marek Polacek <polacek@redhat.com> | 2022-01-05 17:53:30 -0500 |
---|---|---|
committer | Marek Polacek <polacek@redhat.com> | 2022-01-05 19:42:45 -0500 |
commit | 1935db296892bbd9fc597889237528bd7e080ab1 (patch) | |
tree | ed45f27956f374e6cd33e201438d2d50e10cde03 /gcc/c-family/c-pragma.c | |
parent | 0fbefa25b3f928d97fb7fd61f1448a55e5ec612d (diff) | |
download | gcc-1935db296892bbd9fc597889237528bd7e080ab1.zip gcc-1935db296892bbd9fc597889237528bd7e080ab1.tar.gz gcc-1935db296892bbd9fc597889237528bd7e080ab1.tar.bz2 |
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.
Diffstat (limited to 'gcc/c-family/c-pragma.c')
-rw-r--r-- | gcc/c-family/c-pragma.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c index ecf4457..8dde5b8 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; } |