S_del_body is sufficiently small that inlining it is a space win.

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

diff --git a/doop.c b/doop.c
index adf36ea..8d23a31 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -97,8 +97,8 @@ S_do_trans_simple(pTHX_ SV *sv)
 STATIC I32
 S_do_trans_count(pTHX_ SV *sv)
 {
-    U8 *s;
-    U8 *send;
+    const U8 *s;
+    const U8 *send;
     I32 matches = 0;
     STRLEN len;
     const I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT;
@@ -107,7 +107,7 @@ S_do_trans_count(pTHX_ SV *sv)
     if (!tbl)
        Perl_croak(aTHX_ "panic: do_trans_count line %d",__LINE__);
 
-    s = (U8*)SvPV(sv, len);
+    s = (const U8*)SvPV_const(sv, len);
     send = s + len;
 
     if (!SvUTF8(sv))
@@ -395,8 +395,8 @@ S_do_trans_simple_utf8(pTHX_ SV *sv)
 STATIC I32
 S_do_trans_count_utf8(pTHX_ SV *sv)
 {
-    U8 *s;
-    U8 *start = 0, *send;
+    const U8 *s;
+    const U8 *start = 0, *send;
     I32 matches = 0;
     STRLEN len;
 
@@ -407,7 +407,7 @@ S_do_trans_count_utf8(pTHX_ SV *sv)
     const UV extra = none + 1;
     U8 hibit = 0;
 
-    s = (U8*)SvPV(sv, len);
+    s = (const U8*)SvPV_const(sv, len);
     if (!SvUTF8(sv)) {
        const U8 *t = s;
        const U8 *e = s + len;
@@ -605,7 +605,7 @@ Perl_do_trans(pTHX_ SV *sv)
         if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL))
             Perl_croak(aTHX_ PL_no_modify);
     }
-    (void)SvPV(sv, len);
+    (void)SvPV_const(sv, len);
     if (!len)
        return 0;
     if (!(PL_op->op_private & OPpTRANS_IDENTICAL)) {
@@ -717,7 +717,7 @@ UV
 Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size)
 {
     STRLEN srclen, len;
-    unsigned char *s = (unsigned char *) SvPV(sv, srclen);
+    const unsigned char *s = (const unsigned char *) SvPV_const(sv, srclen);
     UV retnum = 0;
 
     if (offset < 0)
@@ -954,7 +954,6 @@ Perl_do_chop(pTHX_ register SV *astr, register SV *sv)
         HV* hv = (HV*)sv;
        HE* entry;
         (void)hv_iterinit(hv);
-        /*SUPPRESS 560*/
         while ((entry = hv_iternext(hv)))
             do_chop(astr,hv_iterval(hv,entry));
         return;
@@ -1006,7 +1005,6 @@ Perl_do_chomp(pTHX_ register SV *sv)
 {
     register I32 count;
     STRLEN len;
-    STRLEN n_a;
     char *s;
     char *temp_buffer = NULL;
     SV* svrecode = Nullsv;
@@ -1032,7 +1030,6 @@ Perl_do_chomp(pTHX_ register SV *sv)
         HV* hv = (HV*)sv;
        HE* entry;
         (void)hv_iterinit(hv);
-        /*SUPPRESS 560*/
         while ((entry = hv_iternext(hv)))
             count += do_chomp(hv_iterval(hv,entry));
         return count;
@@ -1072,7 +1069,7 @@ Perl_do_chomp(pTHX_ register SV *sv)
        }
        else {
            STRLEN rslen, rs_charlen;
-           char *rsptr = SvPV(PL_rs, rslen);
+           const char *rsptr = SvPV_const(PL_rs, rslen);
 
            rs_charlen = SvUTF8(PL_rs)
                ? sv_len_utf8(PL_rs)
@@ -1099,7 +1096,7 @@ Perl_do_chomp(pTHX_ register SV *sv)
                     * Do not recode PL_rs as a side-effect. */
                   svrecode = newSVpvn(rsptr, rslen);
                   sv_recode_to_utf8(svrecode, PL_encoding);
-                  rsptr = SvPV(svrecode, rslen);
+                  rsptr = SvPV_const(svrecode, rslen);
                   rs_charlen = sv_len_utf8(svrecode);
                }
                else {
@@ -1123,7 +1120,7 @@ Perl_do_chomp(pTHX_ register SV *sv)
                count += rs_charlen;
            }
        }
-       s = SvPV_force(sv, n_a);
+       s = SvPV_force_nolen(sv);
        SvCUR_set(sv, len);
        *SvEND(sv) = '\0';
        SvNIOK_off(sv);
@@ -1149,12 +1146,12 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)
     register char *dc;
     STRLEN leftlen;
     STRLEN rightlen;
-    register char *lc;
-    register char *rc;
+    register const char *lc;
+    register const char *rc;
     register I32 len;
     I32 lensave;
-    char *lsave;
-    char *rsave;
+    const char *lsave;
+    const char *rsave;
     const bool left_utf = DO_UTF8(left);
     const bool right_utf = DO_UTF8(right);
     I32 needlen = 0;
@@ -1166,8 +1163,8 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)
 
     if (sv != left || (optype != OP_BIT_AND && !SvOK(sv) && !SvGMAGICAL(sv)))
        sv_setpvn(sv, "", 0);   /* avoid undef warning on |= and ^= */
-    lsave = lc = SvPV_nomg(left, leftlen);
-    rsave = rc = SvPV_nomg(right, rightlen);
+    lsave = lc = SvPV_nomg_const(left, leftlen);
+    rsave = rc = SvPV_nomg_const(right, rightlen);
     len = leftlen < rightlen ? leftlen : rightlen;
     lensave = len;
     if ((left_utf || right_utf) && (sv == left || sv == right)) {
@@ -1380,7 +1377,6 @@ Perl_do_kv(pTHX)
            i = HvKEYS(keys);
        else {
            i = 0;
-           /*SUPPRESS 560*/
            while (hv_iternext(keys)) i++;
        }
        PUSHi( i );