diff options
| author | Chip Salzenberg <chip@pobox.com> | 2008-11-12 07:45:04 -0800 |
|---|---|---|
| committer | Marcus Holland-Moritz <mhx-perl@gmx.net> | 2008-11-13 05:47:34 +0000 |
| commit | af7df2578e5aff079dd90eeab57a2a48fb1a43c0 (patch) | |
| tree | a42bb3f442b701e38962f5707c68350cb3afb2fd /mg.c | |
| parent | df25d2ffed6470ee4093c2b22655779430fd807b (diff) | |
| download | perl-af7df2578e5aff079dd90eeab57a2a48fb1a43c0.tar.gz | |
Re: [perl #60360] [PATCH] UPDATED: local $SIG{FOO} = sub {...}; sets signal handler to SIG_DFL
Message-ID: <20081112234504.GI2062@tytlal.topaz.cx>
Updated patch to retain source compatibility.
Plus using the correct PERL_ARGS_ASSERT_SAVE_HELEM_FLAGS
macro and running make regen.
p4raw-id: //depot/perl@34829
Diffstat (limited to 'mg.c')
| -rw-r--r-- | mg.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -467,7 +467,7 @@ Copy some of the magic from an existing SV to new localized version of that SV. Container magic (eg %ENV, $1, tie) gets copied, value magic doesn't (eg taint, pos). -If empty is false then no set magic will be called on the new (empty) SV. +If setmagic is false then no set magic will be called on the new (empty) SV. This typically means that assignment will soon follow (e.g. 'local $x = $y'), and that will handle the magic. @@ -475,7 +475,7 @@ and that will handle the magic. */ void -Perl_mg_localize(pTHX_ SV *sv, SV *nsv, I32 empty) +Perl_mg_localize(pTHX_ SV *sv, SV *nsv, bool setmagic) { dVAR; MAGIC *mg; @@ -499,7 +499,7 @@ Perl_mg_localize(pTHX_ SV *sv, SV *nsv, I32 empty) if (SvTYPE(nsv) >= SVt_PVMG && SvMAGIC(nsv)) { SvFLAGS(nsv) |= SvMAGICAL(sv); - if (empty) { + if (setmagic) { PL_localizing = 1; SvSETMAGIC(nsv); PL_localizing = 0; |