... Add warning control to warning call.

* c-common.c (check_function_sentinel): Likewise.
(check_nonnull_arg): Likewise.

From-SVN: r102266

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01322a4d753657e082705a90d2761f1425c4226b..2699e1212f44e65f7e64b8d5078ed3a92df4ca7a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -4,6 +4,8 @@
        call.
        * c-typeck.c (parser_build_binary_op): Likewise.
        (c_finish_if_stmt): Likewise.
+       * c-common.c (check_function_sentinel): Likewise.
+       (check_nonnull_arg): Likewise.
 
 2005-07-21  Richard Henderson  <rth@redhat.com>
 

diff --git a/gcc/c-common.c b/gcc/c-common.c
index 3c341d87b0c24ad8fe5e5d71d23461cd77cf7b6d..8646b4cc7ee28b6002d01e5e4ba4c533f1745fe8 100644 (file)
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -5259,7 +5259,8 @@ check_function_sentinel (tree attrs, tree params, tree typelist)
       }
       
       if (typelist || !params)
-       warning (0, "not enough variable arguments to fit a sentinel");
+       warning (OPT_Wformat,
+                "not enough variable arguments to fit a sentinel");
       else
         {
          tree sentinel, end;
@@ -5281,7 +5282,8 @@ check_function_sentinel (tree attrs, tree params, tree typelist)
            }
          if (pos > 0)
            {
-             warning (0, "not enough variable arguments to fit a sentinel");
+             warning (OPT_Wformat,
+                      "not enough variable arguments to fit a sentinel");
              return;
            }
 
@@ -5302,7 +5304,7 @@ check_function_sentinel (tree attrs, tree params, tree typelist)
                 We warn with -Wstrict-null-sentinel, though.  */
               && (warn_strict_null_sentinel
                  || null_node != TREE_VALUE (sentinel)))
-           warning (0, "missing sentinel in function call");
+           warning (OPT_Wformat, "missing sentinel in function call");
        }
     }
 }
@@ -5344,8 +5346,8 @@ check_nonnull_arg (void * ARG_UNUSED (ctx), tree param,
     return;
 
   if (integer_zerop (param))
-    warning (0, "null argument where non-null required (argument %lu)",
-            (unsigned long) param_num);
+    warning (OPT_Wnonnull, "null argument where non-null required "
+            "(argument %lu)", (unsigned long) param_num);
 }
 
 /* Helper for nonnull attribute handling; fetch the operand number