* c-typeck.c (digest_init): Call 'convert_for_assignment'

	before returning.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102090 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de6bad9..8b57b80 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * c-typeck.c (digest_init): Call 'convert_for_assignment'
+       before returning.
+
 2005-07-16  Jan Hubicka  <jh@suse.cz>
 
        * cfg.c (update_bb_profile_for_threading): Fix profile updating.

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index ab72cee..907a4fc 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -4442,6 +4442,10 @@ digest_init (tree type, tree init, bool strict_string, int require_constant)
          inside_init = error_mark_node;
        }
 
+      /* Added to enable additional -Wmissing-format-attribute warnings.  */
+      if (TREE_CODE (TREE_TYPE (inside_init)) == POINTER_TYPE)
+       inside_init = convert_for_assignment (type, inside_init, ic_init, NULL_TREE,
+                                             NULL_TREE, 0);
       return inside_init;
     }