This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Remove redundant SvUTF8_on() calls
authorGisle Aas <gisle@aas.no>
Wed, 30 Nov 2005 09:28:54 +0000 (01:28 -0800)
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Wed, 30 Nov 2005 17:57:16 +0000 (17:57 +0000)
Message-ID: <lrhd9uhwo9.fsf@caliper.activestate.com>

p4raw-id: //depot/perl@26231

pp.c
sv.c

diff --git a/pp.c b/pp.c
index 401e1e3..09d71ce 100644 (file)
--- a/pp.c
+++ b/pp.c
@@ -3228,8 +3228,6 @@ PP(pp_sprintf)
     dSP; dMARK; dORIGMARK; dTARGET;
     do_sprintf(TARG, SP-MARK, MARK+1);
     TAINT_IF(SvTAINTED(TARG));
-    if (DO_UTF8(*(MARK+1)))
-       SvUTF8_on(TARG);
     SP = ORIGMARK;
     PUSHTARG;
     RETURN;
diff --git a/sv.c b/sv.c
index add0e9b..20bc9c1 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -7978,8 +7978,6 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
        }
        else if (svix < svmax) {
            sv_catsv(sv, *svargs);
-           if (DO_UTF8(*svargs))
-               SvUTF8_on(sv);
        }
        return;
     }
@@ -7987,8 +7985,6 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
                pat[1] == '-' && pat[2] == 'p') {
        argsv = va_arg(*args, SV*);
        sv_catsv(sv, argsv);
-       if (DO_UTF8(argsv))
-           SvUTF8_on(sv);
        return;
     }