X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pad.c;h=2e0b863f54249fad164f9209bba3094b72a35461;hb=482aa6ffeb230a1cea9d05e9eb425b3d7fc09217;hp=86fa7c4f55dc697c80d042ed5ae5e45ad1d8ce5e;hpb=ad64d0ecd555e97c5a216efca1ec5a96b7fd0b34;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pad.c b/pad.c
index 86fa7c4..2e0b863 100644
--- a/pad.c
+++ b/pad.c
@@ -5,13 +5,17 @@
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
+ */
+
+/*
+ *  'Anyway: there was this Mr. Frodo left an orphan and stranded, as you
+ *   might say, among those queer Bucklanders, being brought up anyhow in
+ *   Brandy Hall.  A regular warren, by all accounts.  Old Master Gorbadoc
+ *   never had fewer than a couple of hundred relations in the place.
+ *   Mr. Bilbo never did a kinder deed than when he brought the lad back
+ *   to live among decent folk.'                           --the Gaffer
  *
- *  "Anyway: there was this Mr Frodo left an orphan and stranded, as you
- *  might say, among those queer Bucklanders, being brought up anyhow in
- *  Brandy Hall. A regular warren, by all accounts. Old Master Gorbadoc
- *  never had fewer than a couple of hundred relations in the place. Mr
- *  Bilbo never did a kinder deed than when he brought the lad back to
- *  live among decent folk." --the Gaffer
+ *     [p.23 of _The Lord of the Rings_, I/i: "A Long-Expected Party"]
  */
 
 /* XXX DAPM
@@ -176,7 +180,7 @@ Perl_pad_new(pTHX_ int flags)
 	    SAVEI32(PL_max_intro_pending);
 	    SAVEBOOL(PL_cv_has_eval);
 	    if (flags & padnew_SAVESUB) {
-		SAVEI32(PL_pad_reset_pending);
+		SAVEBOOL(PL_pad_reset_pending);
 	    }
 	}
     }
@@ -777,9 +781,9 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
 			? CvANON(cv) && CvCLONE(cv) && !CvCLONED(cv)
 			: *out_flags & PAD_FAKELEX_ANON)
 		{
-		    if (warn && ckWARN(WARN_CLOSURE))
-			Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
-			    "Variable \"%s\" is not available", name);
+		    if (warn)
+			Perl_ck_warner(aTHX_ packWARN(WARN_CLOSURE),
+				       "Variable \"%s\" is not available", name);
 		    *out_capture = NULL;
 		}
 
@@ -819,9 +823,8 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
 		    if (SvPADSTALE(*out_capture)
 			&& !SvPAD_STATE(name_svp[offset]))
 		    {
-			if (ckWARN(WARN_CLOSURE))
-			    Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
-				"Variable \"%s\" is not available", name);
+			Perl_ck_warner(aTHX_ packWARN(WARN_CLOSURE),
+				       "Variable \"%s\" is not available", name);
 			*out_capture = NULL;
 		    }
 		}
@@ -1062,11 +1065,10 @@ Perl_pad_leavemy(pTHX)
     if (PL_min_intro_pending && PL_comppad_name_fill < PL_min_intro_pending) {
 	for (off = PL_max_intro_pending; off >= PL_min_intro_pending; off--) {
 	    const SV * const sv = svp[off];
-	    if (sv && sv != &PL_sv_undef
-		    && !SvFAKE(sv) && ckWARN_d(WARN_INTERNAL))
-		Perl_warner(aTHX_ packWARN(WARN_INTERNAL),
-			    "%"SVf" never introduced",
-			    SVfARG(sv));
+	    if (sv && sv != &PL_sv_undef && !SvFAKE(sv))
+		Perl_ck_warner_d(aTHX_ packWARN(WARN_INTERNAL),
+				 "%"SVf" never introduced",
+				 SVfARG(sv));
 	}
     }
     /* "Deintroduce" my variables that are leaving with this scope. */
@@ -1146,8 +1148,8 @@ Mark all the current temporaries for reuse
  * to  a shared TARG.  Such an alias will change randomly and unpredictably.
  * We avoid doing this until we can think of a Better Way.
  * GSAR 97-10-29 */
-void
-Perl_pad_reset(pTHX)
+static void
+S_pad_reset(pTHX)
 {
     dVAR;
 #ifdef USE_BROKEN_PAD_RESET
@@ -1306,13 +1308,7 @@ Perl_pad_free(pTHX_ PADOFFSET po)
 	SvPADTMP_off(PL_curpad[po]);
 #ifdef USE_ITHREADS
 	/* SV could be a shared hash key (eg bugid #19022) */
-	if (
-#ifdef PERL_OLD_COPY_ON_WRITE
-	    !SvIsCOW(PL_curpad[po])
-#else
-	    !SvFAKE(PL_curpad[po])
-#endif
-	    )
+	if (!SvIsCOW(PL_curpad[po]))
 	    SvREADONLY_off(PL_curpad[po]);	/* could be a freed constant */
 #endif
     }
@@ -1529,9 +1525,8 @@ Perl_cv_clone(pTHX_ CV *proto)
 		   while my $x if $false can leave an active var marked as
 		   stale. And state vars are always available */
 		if (SvPADSTALE(sv) && !SvPAD_STATE(namesv)) {
-		    if (ckWARN(WARN_CLOSURE))
-			Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
-			    "Variable \"%s\" is not available", SvPVX_const(namesv));
+		    Perl_ck_warner(aTHX_ packWARN(WARN_CLOSURE),
+				   "Variable \"%s\" is not available", SvPVX_const(namesv));
 		    sv = NULL;
 		}
 		else