In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f8279d106847c47fc5a4092b27d4f24faffd84cd?hp=073063bbd8679b4a7ad10dcbff312e11f75cd917>
- Log ----------------------------------------------------------------- commit f8279d106847c47fc5a4092b27d4f24faffd84cd Author: Nicholas Clark <[email protected]> Date: Mon Oct 12 11:03:42 2009 +0100 In Perl_ckwarn(), simplify the check of isLEXWARN_on/isLEXWARN_off. ----------------------------------------------------------------------- Summary of changes: util.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/util.c b/util.c index ae8c688..6ee5ddf 100644 --- a/util.c +++ b/util.c @@ -1572,11 +1572,9 @@ bool Perl_ckwarn(pTHX_ U32 w) { dVAR; - return - ( - isLEXWARN_on - && PL_curcop->cop_warnings != pWARN_NONE - && ( + return isLEXWARN_on + ? (PL_curcop->cop_warnings != pWARN_NONE + && ( PL_curcop->cop_warnings == pWARN_ALL || isWARN_on(PL_curcop->cop_warnings, unpackWARN1(w)) || (unpackWARN2(w) && @@ -1586,12 +1584,8 @@ Perl_ckwarn(pTHX_ U32 w) || (unpackWARN4(w) && isWARN_on(PL_curcop->cop_warnings, unpackWARN4(w))) ) - ) - || - ( - isLEXWARN_off && PL_dowarn & G_WARN_ON - ) - ; + ) + : (PL_dowarn & G_WARN_ON); } /* implements the ckWARN?_d macro */ -- Perl5 Master Repository
