extra code in pp_concat, Take 2

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

diff --git a/mg.c b/mg.c
index f7300e4..af52790 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -145,8 +145,8 @@ int
 Perl_mg_get(pTHX_ SV *sv)
 {
     const I32 mgs_ix = SSNEW(sizeof(MGS));
-    const bool was_temp = SvTEMP(sv);
-    int new = 0;
+    const bool was_temp = (bool)SvTEMP(sv);
+    int have_new = 0;
     MAGIC *newmg, *head, *cur, *mg;
     /* guard against sv having being freed midway by holding a private
        reference. */
@@ -185,19 +185,19 @@ Perl_mg_get(pTHX_ SV *sv)
 
        mg = mg->mg_moremagic;
 
-       if (new) {
+       if (have_new) {
            /* Have we finished with the new entries we saw? Start again
               where we left off (unless there are more new entries). */
            if (mg == head) {
-               new  = 0;
+               have_new = 0;
                mg   = cur;
                head = newmg;
            }
        }
 
        /* Were any new entries added? */
-       if (!new && (newmg = SvMAGIC(sv)) != head) {
-           new = 1;
+       if (!have_new && (newmg = SvMAGIC(sv)) != head) {
+           have_new = 1;
            cur = mg;
            mg  = newmg;
        }
@@ -417,7 +417,7 @@ Perl_mg_free(pTHX_ SV *sv)
            SvREFCNT_dec(mg->mg_obj);
        Safefree(mg);
     }
-    SvMAGIC(sv) = 0;
+    SvMAGIC_set(sv, NULL);
     return 0;
 }
 
@@ -777,11 +777,11 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
                            MAGIC* mg = SvMAGIC(sv);
                            MAGIC* mgt;
                            PL_tainted = 1;
-                           SvMAGIC(sv) = mg->mg_moremagic;
+                           SvMAGIC_set(sv, mg->mg_moremagic);
                            SvTAINT(sv);
                            if ((mgt = SvMAGIC(sv))) {
                                mg->mg_moremagic = mgt;
-                               SvMAGIC(sv) = mg;
+                               SvMAGIC_set(sv, mg);
                            }
                        } else
                            SvTAINTED_off(sv);
@@ -1980,7 +1980,7 @@ Perl_magic_killbackrefs(pTHX_ SV *sv, MAGIC *mg)
            if (!SvWEAKREF(svp[i]))
                Perl_croak(aTHX_ "panic: magic_killbackrefs");
            /* XXX Should we check that it hasn't changed? */
-           SvRV(svp[i]) = 0;
+           SvRV_set(svp[i], 0);
            SvOK_off(svp[i]);
            SvWEAKREF_off(svp[i]);
            svp[i] = Nullsv;
@@ -2162,8 +2162,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
        break;
     case '\020':       /* ^P */
        PL_perldb = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
-       if ((PERLDB_SUB || PERLDB_LINE || PERLDB_SUBLINE || PERLDB_ASSERTION)
-               && !PL_DBsingle)
+       if (PL_perldb && !PL_DBsingle)
            init_debugger();
        break;
     case '\024':       /* ^T */
@@ -2489,7 +2488,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
        {
             union pstun un;
             s = SvPV(sv, len);
-            un.pst_command = s;
+            un.pst_command = (char *)s;
             pstat(PSTAT_SETCMD, un, len, 0, 0);
        }
 #endif