blead 25801: Symbian batch of today

[p5sagit/p5-mst-13.2.git] / doop.c

diff --git a/doop.c b/doop.c
index 3604b94..9e55103 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -977,7 +977,7 @@ Perl_do_chop(pTHX_ register SV *astr, register SV *sv)
            s = send - 1;
            while (s > start && UTF8_IS_CONTINUATION(*s))
                s--;
-           if (utf8_to_uvchr((U8*)s, 0)) {
+           if (is_utf8_string((U8*)s, send - s)) {
                sv_setpvn(astr, s, send - s);
                *s = '\0';
                SvCUR_set(sv, s - start);
@@ -1017,7 +1017,7 @@ Perl_do_chomp(pTHX_ register SV *sv)
     count = 0;
     if (SvTYPE(sv) == SVt_PVAV) {
        register I32 i;
-       AV* av = (AV*)sv;
+       AV* const av = (AV*)sv;
        const I32 max = AvFILL(av);
 
        for (i = 0; i <= max; i++) {
@@ -1028,7 +1028,7 @@ Perl_do_chomp(pTHX_ register SV *sv)
         return count;
     }
     else if (SvTYPE(sv) == SVt_PVHV) {
-        HV* hv = (HV*)sv;
+       HV* const hv = (HV*)sv;
        HE* entry;
         (void)hv_iterinit(hv);
         while ((entry = hv_iternext(hv)))
@@ -1173,8 +1173,7 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)
        Newxz(dc, needlen + 1, char);
     }
     else if (SvOK(sv) || SvTYPE(sv) > SVt_PVMG) {
-       STRLEN n_a;
-       dc = SvPV_force_nomg(sv, n_a);
+       dc = SvPV_force_nomg_nolen(sv);
        if (SvCUR(sv) < (STRLEN)len) {
            dc = SvGROW(sv, (STRLEN)(len + 1));
            (void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1);
@@ -1390,7 +1389,7 @@ Perl_do_kv(pTHX)
     while ((entry = hv_iternext(keys))) {
        SPAGAIN;
        if (dokeys) {
-           SV* sv = hv_iterkeysv(entry);
+           SV* const sv = hv_iterkeysv(entry);
            XPUSHs(sv); /* won't clobber stack_sp */
        }
        if (dovalues) {