From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 28 Dec 2007 23:15:47 +0000 (+0000)
Subject: Replace 3 uses of RX_PRELEN(r) with plen, which has the same value.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bb661a585caf67142a296faaea725681ffc2a2ac;p=p5sagit%2Fp5-mst-13.2.git

Replace 3 uses of RX_PRELEN(r) with plen, which has the same value.
(But isn't a pointer dereference. Or about to become a calculation.)

p4raw-id: //depot/perl@32756
---

diff --git a/regcomp.c b/regcomp.c
index 481d3a6..5c7ee09 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -4290,7 +4290,7 @@ redo_first_pass:
 	U16 reganch = (U16)((r->extflags & RXf_PMf_STD_PMMOD) >> 12);
 	const char *fptr = STD_PAT_MODS;        /*"msix"*/
 	char *p;
-        r->wraplen = RX_PRELEN(r) + has_minus + has_p + has_runon
+        r->wraplen = plen + has_minus + has_p + has_runon
             + (sizeof(STD_PAT_MODS) - 1)
             + (sizeof("(?:)") - 1);
 
@@ -4318,10 +4318,10 @@ redo_first_pass:
         }
 
         *p++ = ':';
-        Copy(RExC_precomp, p, RX_PRELEN(r), char);
+        Copy(RExC_precomp, p, plen, char);
 	assert ((r->wrapped - p) < 16);
 	r->pre_prefix = p - r->wrapped;
-        p += RX_PRELEN(r);
+        p += plen;
         if (has_runon)
             *p++ = '\n';
         *p++ = ')';