From 041457d90dbb6fb79a72c7a8462f01423f2daa09 Mon Sep 17 00:00:00 2001 From: Dave Mitchell Date: Wed, 13 Jul 2005 00:21:13 +0000 Subject: make the expensive ckWARN() be called as late as possible reorganise if (ckWARN(FOO) && should_not_happen_condition) to if (should_not_happen_condition && ckWARN(FOO)) p4raw-id: //depot/perl@25129 --- pp_hot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pp_hot.c') diff --git a/pp_hot.c b/pp_hot.c index b4b73ad566..07eb58553c 100644 --- a/pp_hot.c +++ b/pp_hot.c @@ -1494,8 +1494,9 @@ Perl_do_readline(pTHX) } } if (!fp) { - if (ckWARN2(WARN_GLOB, WARN_CLOSED) - && (!io || !(IoFLAGS(io) & IOf_START))) { + if ((!io || !(IoFLAGS(io) & IOf_START)) + && ckWARN2(WARN_GLOB, WARN_CLOSED)) + { if (type == OP_GLOB) Perl_warner(aTHX_ packWARN(WARN_GLOB), "glob failed (can't start child: %s)", @@ -1610,8 +1611,8 @@ Perl_do_readline(pTHX) const STRLEN len = SvCUR(sv) - offset; const U8 *f; - if (ckWARN(WARN_UTF8) && - !Perl_is_utf8_string_loc(aTHX_ s, len, &f)) + if (!Perl_is_utf8_string_loc(aTHX_ s, len, &f) + && ckWARN(WARN_UTF8)) /* Emulate :encoding(utf8) warning in the same case. */ Perl_warner(aTHX_ packWARN(WARN_UTF8), "utf8 \"\\x%02X\" does not map to Unicode", -- cgit v1.2.1