From 30480ec4bb9c2ec84d954943728b0d75ba00aa01 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 21 Jul 2005 23:11:24 -0400 Subject: [PATCH] ... Add warning control to warning call. * c-common.c (check_function_sentinel): Likewise. (check_nonnull_arg): Likewise. From-SVN: r102266 --- gcc/ChangeLog | 2 ++ gcc/c-common.c | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 01322a4d753..2699e1212f4 100644 --- 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 diff --git a/gcc/c-common.c b/gcc/c-common.c index 3c341d87b0c..8646b4cc7ee 100644 --- 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 -- 2.30.2