From 7485aeea44b120d4d64e85401f08d172426a81fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Tue, 18 Mar 2014 19:58:39 +0000 Subject: [PATCH] re PR c/55383 (-Wcast-qual reports incorrect message) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2014-03-18 Manuel López-Ibáñez PR c/55383 c/ * c-typeck.c: Use correct format string in cast-qual warning testsuite/ * c-c++-common/Wcast-qual-1.c: More precise match text. From-SVN: r208661 --- gcc/c/ChangeLog | 5 +++++ gcc/c/c-typeck.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/c-c++-common/Wcast-qual-1.c | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 9d854a7feb6..b39b7d654bd 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2014-03-18 Manuel López-Ibáñez + + PR c/55383 + * c-typeck.c: Use correct format string in cast-qual warning + 2014-03-07 Thomas Schwinge * c-decl.c (c_decl_attributes): Use diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 524a59f12e2..0bfc12beabe 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -4855,7 +4855,7 @@ handle_warn_cast_qual (location_t loc, tree type, tree otype) /* There are qualifiers present in IN_OTYPE that are not present in IN_TYPE. */ warning_at (loc, OPT_Wcast_qual, - "cast discards %q#v qualifier from pointer target type", + "cast discards %qv qualifier from pointer target type", discarded); if (added || discarded) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6eb795bda84..ffb6112cc59 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-03-18 Manuel López-Ibáñez + + PR c/55383 + * c-c++-common/Wcast-qual-1.c: More precise match text. + 2014-03-18 Paolo Carlini PR c++/60305 diff --git a/gcc/testsuite/c-c++-common/Wcast-qual-1.c b/gcc/testsuite/c-c++-common/Wcast-qual-1.c index 640e4f0b683..af804389cee 100644 --- a/gcc/testsuite/c-c++-common/Wcast-qual-1.c +++ b/gcc/testsuite/c-c++-common/Wcast-qual-1.c @@ -85,11 +85,11 @@ f3 (void ***bar) void f4 (void * const **bar) { - const void ***p9 = (const void ***) bar; /* { dg-warning "cast" } */ + const void ***p9 = (const void ***) bar; /* { dg-warning "cast discards .const. qualifier " } */ void * const **p11 = (void * const **) bar; void ** const *p13 = (void ** const *) bar; /* { dg-warning "cast" } */ const void * const **p15 = (const void * const **) bar; /* { dg-warning "cast" } */ - const void ** const *p17 = (const void ** const *) bar; /* { dg-warning "cast" } */ + const void ** const *p17 = (const void ** const *) bar; /* { dg-warning "cast discards .const. qualifier" } */ void * const * const * p19 = (void * const * const *) bar; const void * const * const *p21 = (const void * const * const *) bar; } -- 2.30.2