[prev in list] [next in list] [prev in thread] [next in thread] 

List:       perl5-changes
Subject:    [perl.git]  branch smoke-me/gcc460, updated. v5.13.11-334-g9c25013
From:       "Nicholas Clark" <nick () ccl4 ! org>
Date:       2011-03-29 15:39:51
Message-ID: E1Q4b1L-0006Me-2h () camel ! ams6 ! corp ! booking ! com
[Download RAW message or body]

In perl.git, the branch smoke-me/gcc460 has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/9c25013ed454e00589e4cd57ede05fec9147c6b5?hp=dcddeba64665deae2d03428a58e959c9ab82f83b>


- Log -----------------------------------------------------------------
commit 9c25013ed454e00589e4cd57ede05fec9147c6b5
Author: Nicholas Clark <nick@ccl4.org>
Date:   Tue Mar 29 16:37:10 2011 +0100

    In Perl_regdupe_internal() eliminate npar, which is assigned to but never used.
    
    It has been unused since 28d8d7f41ab202dd restructured the regexp dup code.

M	regcomp.c

commit 5bbe196f1a436936b47c0fd2f1cf22055338e2fa
Author: Nicholas Clark <nick@ccl4.org>
Date:   Tue Mar 29 15:36:40 2011 +0100

    In S_regpiece(), only declare parse_start if conditional code needs it.
    
    gcc 4.6.0 warns about variables that are set but never read, and unless
    RE_TRACK_PATTERN_OFFSETS is defined, parse_start is never read. So avoid
    declaring or setting it if it's not actually going to be used later.

M	regcomp.c
-----------------------------------------------------------------------

Summary of changes:
 regcomp.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/regcomp.c b/regcomp.c
index 560696e..45c17ec 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -7454,7 +7454,9 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 \
depth)  const char * const origparse = RExC_parse;
     I32 min;
     I32 max = REG_INFTY;
+#ifdef RE_TRACK_PATTERN_OFFSETS
     char *parse_start;
+#endif
     const char *maxpos = NULL;
     GET_RE_DEBUG_FLAGS_DECL;
 
@@ -7473,7 +7475,9 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 \
depth)  
     if (op == '{' && regcurly(RExC_parse)) {
 	maxpos = NULL;
+#ifdef RE_TRACK_PATTERN_OFFSETS
         parse_start = RExC_parse; /* MJD */
+#endif
 	next = RExC_parse + 1;
 	while (isDIGIT(*next) || *next == ',') {
 	    if (*next == ',') {
@@ -7569,7 +7573,9 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 \
depth)  vFAIL("Regexp *+ operand could be empty");
 #endif
 
+#ifdef RE_TRACK_PATTERN_OFFSETS
     parse_start = RExC_parse;
+#endif
     nextchar(pRExC_state);
 
     *flagp = (op != '+') ? (WORST|SPSTART|HASWIDTH) : (WORST|HASWIDTH);
@@ -11666,12 +11672,11 @@ Perl_regdupe_internal(pTHX_ REGEXP * const rx, CLONE_PARAMS \
*param)  dVAR;
     struct regexp *const r = (struct regexp *)SvANY(rx);
     regexp_internal *reti;
-    int len, npar;
+    int len;
     RXi_GET_DECL(r,ri);
 
     PERL_ARGS_ASSERT_REGDUPE_INTERNAL;
     
-    npar = r->nparens+1;
     len = ProgLen(ri);
     
     Newxc(reti, sizeof(regexp_internal) + len*sizeof(regnode), char, \
regexp_internal);

--
Perl5 Master Repository


[prev in list] [next in list] [prev in thread] [next in thread]