X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pad.c;h=8afa81e56d924b7de4a6d8cdda7ccbd479142da3;hb=4c79ee7a1e7564ef83d0ac25d6677fdebb3ec7aa;hp=a36c81fbc81110d3d2cc098dcc55b073264113e2;hpb=235cc2e3b03f7c8478aa5ccdbe27e0aaf735bb46;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pad.c b/pad.c
index a36c81f..8afa81e 100644
--- a/pad.c
+++ b/pad.c
@@ -1,6 +1,6 @@
 /*    pad.c
  *
- *    Copyright (c) 2002, Larry Wall
+ *    Copyright (c) 2003, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -552,13 +552,8 @@ Perl_pad_findmy(pTHX_ char *name)
 	    continue;
 	}
 	else {
-	    if (
-		   (   seq >  (U32)I_32(SvNVX(sv))	/* min */
-		    && seq <= (U32)SvIVX(sv))		/* max */
-		||
-		    /* 'our' is visible before introduction */
-		    (!SvIVX(sv) && (SvFLAGS(sv) & SVpad_OUR))
-	    )
+	    if (   seq >  (U32)I_32(SvNVX(sv))	/* min */
+		&& seq <= (U32)SvIVX(sv))	/* max */
 		return off;
 	}
     }
@@ -914,7 +909,7 @@ Perl_pad_leavemy(pTHX)
 	    if ((sv = svp[off]) && sv != &PL_sv_undef
 		    && !SvFAKE(sv) && ckWARN_d(WARN_INTERNAL))
 		Perl_warner(aTHX_ packWARN(WARN_INTERNAL),
-					"%s never introduced", SvPVX(sv));
+					"%"SVf" never introduced", sv);
 	}
     }
     /* "Deintroduce" my variables that are leaving with this scope. */