* c-decl.c (implicit_decl_warning): Add a comment. Fix formatting.

From-SVN: r246069

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index df4f65d2a52d288cd7e00dc34a103b81527de698..b13834622d8c90d17396d6ef93eca7f0f57cfc22 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-11  Marek Polacek  <polacek@redhat.com>
+
+       * c-decl.c (implicit_decl_warning): Add a comment.  Fix formatting.
+
 2017-03-10  David Malcolm  <dmalcolm@redhat.com>
 
        PR translation/79848

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 0f10208a54f132c949ad4744716d273c081c6aff..a0dc5bc0bee4fa7ced72033ef1c4d464061ca8c5 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -3117,45 +3117,52 @@ pushdecl_top_level (tree x)
   return x;
 }
 \f
+
+/* Issue a warning about implicit function declaration.  ID is the function
+   identifier, OLDDECL is a declaration of the function in a different scope,
+   or NULL_TREE.  */
+
 static void
 implicit_decl_warning (location_t loc, tree id, tree olddecl)
 {
-  if (warn_implicit_function_declaration)
-    {
-      bool warned;
-      const char *hint = NULL;
-      if (!olddecl)
-       hint = lookup_name_fuzzy (id, FUZZY_LOOKUP_FUNCTION_NAME);
+  if (!warn_implicit_function_declaration)
+    return;
 
-      if (flag_isoc99)
-       if (hint)
-         {
-           gcc_rich_location richloc (loc);
-           richloc.add_fixit_replace (hint);
-           warned = pedwarn_at_rich_loc
-             (&richloc, OPT_Wimplicit_function_declaration,
-              "implicit declaration of function %qE; did you mean %qs?",
-              id, hint);
-         }
-       else
-         warned = pedwarn (loc, OPT_Wimplicit_function_declaration,
-                           "implicit declaration of function %qE", id);
+  bool warned;
+  const char *hint = NULL;
+  if (!olddecl)
+    hint = lookup_name_fuzzy (id, FUZZY_LOOKUP_FUNCTION_NAME);
+
+  if (flag_isoc99)
+    {
+      if (hint)
+       {
+         gcc_rich_location richloc (loc);
+         richloc.add_fixit_replace (hint);
+         warned = pedwarn_at_rich_loc
+           (&richloc, OPT_Wimplicit_function_declaration,
+            "implicit declaration of function %qE; did you mean %qs?",
+            id, hint);
+       }
       else
-       if (hint)
-         {
-           gcc_rich_location richloc (loc);
-           richloc.add_fixit_replace (hint);
-           warned = warning_at_rich_loc
-             (&richloc, OPT_Wimplicit_function_declaration,
-              G_("implicit declaration of function %qE; did you mean %qs?"),
-              id, hint);
-         }
-       else
-         warned = warning_at (loc, OPT_Wimplicit_function_declaration,
-                              G_("implicit declaration of function %qE"), id);
-      if (olddecl && warned)
-       locate_old_decl (olddecl);
+       warned = pedwarn (loc, OPT_Wimplicit_function_declaration,
+                         "implicit declaration of function %qE", id);
     }
+  else if (hint)
+    {
+      gcc_rich_location richloc (loc);
+      richloc.add_fixit_replace (hint);
+      warned = warning_at_rich_loc
+       (&richloc, OPT_Wimplicit_function_declaration,
+        G_("implicit declaration of function %qE; did you mean %qs?"),
+        id, hint);
+    }
+  else
+    warned = warning_at (loc, OPT_Wimplicit_function_declaration,
+                        G_("implicit declaration of function %qE"), id);
+
+  if (olddecl && warned)
+    locate_old_decl (olddecl);
 }
 
 /* This function represents mapping of a function code FCODE