From e4f7495686064f7d2b4d79529c27d4d5cbcc2672 Mon Sep 17 00:00:00 2001 From: Yves Orton Date: Tue, 18 Jul 2006 23:57:15 +0200 Subject: [PATCH] Re: Silence/fix more warnings from the regex engine Message-ID: <9b18b3110607181257l28cc424aj1de28ebfc4c196d7@mail.gmail.com> REGCP_SET should only set a value, not check the previous value of its arg p4raw-id: //depot/perl@28623 --- regexec.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/regexec.c b/regexec.c index 59d5624..a0ea7f2 100644 --- a/regexec.c +++ b/regexec.c @@ -197,17 +197,16 @@ S_regcppush(pTHX_ I32 parenfloor) /* These are needed since we do not localize EVAL nodes: */ #define REGCP_SET(cp) \ DEBUG_STATE_r( \ - if (cp != PL_savestack_ix) \ PerlIO_printf(Perl_debug_log, \ - " Setting an EVAL scope, savestack=%"IVdf"\n", \ + " Setting an EVAL scope, savestack=%"IVdf"\n", \ (IV)PL_savestack_ix)); \ cp = PL_savestack_ix #define REGCP_UNWIND(cp) \ - DEBUG_EXECUTE_r( \ + DEBUG_STATE_r( \ if (cp != PL_savestack_ix) \ - PerlIO_printf(Perl_debug_log, \ - " Clearing an EVAL scope, savestack=%"IVdf"..%"IVdf"\n", \ + PerlIO_printf(Perl_debug_log, \ + " Clearing an EVAL scope, savestack=%"IVdf"..%"IVdf"\n", \ (IV)(cp), (IV)PL_savestack_ix)); \ regcpblow(cp) @@ -1412,7 +1411,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, PerlIO_printf( Perl_debug_log, "%sState: %4"UVxf", Base: 0x%-4"UVxf" uvc=%"UVxf" word=%"UVxf"\n", failed ? "Fail transition to " : "", - state, base, uvc, word) + (UV)state, (UV)base, (UV)uvc, (UV)word) ); if ( base ) { U32 tmp; @@ -1461,7 +1460,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, PerlIO_printf( Perl_debug_log, "%sState: %4"UVxf", Base: 0x%-4"UVxf" uvc=%"UVxf"\n", "All done: ", - state, base, uvc) + (UV)state, (UV)base, (UV)uvc) ); if (leftmost) { s = (char*)leftmost; @@ -1791,7 +1790,7 @@ Perl_regexec_flags(pTHX_ register regexp *prog, char *stringarg, register char * s,strend-s,60); PerlIO_printf(Perl_debug_log, "Matching stclass %.*s against %s (%d chars)\n", - SvCUR(prop), SvPVX_const(prop), + (int)SvCUR(prop), SvPVX_const(prop), quoted, (int)(strend - s)); } }); @@ -4348,8 +4347,8 @@ yes_final: st = SLAB_LAST(PL_regmatch_slab); } depth -= (st - yes_state); - DEBUG_STATE_r(PerlIO_printf(Perl_debug_log, "POP STATES (%d..%d)\n", - depth+1, depth+(st - yes_state))); + DEBUG_STATE_r(PerlIO_printf(Perl_debug_log, "POP STATES (%"UVuf"..%"UVuf")\n", + (UV)(depth+1), (UV)(depth+(st - yes_state)))); st = yes_state; yes_state = st->u.yes.prev_yes_state; PL_regmatch_state = st; -- 2.7.4