From 3e1022372a8200bc4c7354e0f588c7f71584a888 Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Sat, 29 Oct 2011 13:41:13 -0700 Subject: [PATCH] Remove some repeated code in pp_regcomp --- pp_ctl.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pp_ctl.c b/pp_ctl.c index eb74840..6405924 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -214,19 +214,11 @@ PP(pp_regcomp) const char *const p = SvPV(tmpstr, len); tmpstr = newSVpvn_flags(p, len, SVs_TEMP); } - else if (SvAMAGIC(tmpstr)) { + else if (SvAMAGIC(tmpstr) || SvGMAGICAL(tmpstr)) { /* make a copy to avoid extra stringifies */ tmpstr = newSVpvn_flags(t, len, SVs_TEMP | SvUTF8(tmpstr)); } - /* If it is gmagical, create a mortal copy, but without calling - get-magic, as we have already done that. */ - if(SvGMAGICAL(tmpstr)) { - SV *mortalcopy = sv_newmortal(); - sv_setsv_flags(mortalcopy, tmpstr, 0); - tmpstr = mortalcopy; - } - if (eng) PM_SETRE(pm, CALLREGCOMP_ENG(eng, tmpstr, pm_flags)); else -- 2.7.4