re PR c/55383 (-Wcast-qual reports incorrect message)

2014-03-18  Manuel López-Ibáñez  <manu@gcc.gnu.org>

	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

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 9d854a7feb695fdb9fd49cfcc6723d453a084a27..b39b7d654bd2535b6ecdec804969f0ba6e503aa5 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-18  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       PR c/55383
+       * c-typeck.c: Use correct format string in cast-qual warning
+
 2014-03-07  Thomas Schwinge  <thomas@codesourcery.com>
 
        * c-decl.c (c_decl_attributes): Use

diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 524a59f12e274ab6a76fabd82a93519cec5bab5d..0bfc12beabe29f553f5e32096c0de2c2a2432f3a 100644 (file)
--- 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 6eb795bda842c9ace38e4d179e36657b482df205..ffb6112cc59deb8deff5d4bb12ec34780745addf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-18  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       PR c/55383
+       * c-c++-common/Wcast-qual-1.c: More precise match text.
+
 2014-03-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
        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 640e4f0b683c21ab53ac1103dfaf42f2248eb0f1..af804389ceefa1fa050f2ed2bd31ff211bf2c75b 100644 (file)
--- 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;
 }