sv_find() returning false, followed by sv_magic() to add the magic,

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

diff --git a/pp_sort.c b/pp_sort.c
index 7588625..7585b75 100644 (file)
--- a/pp_sort.c
+++ b/pp_sort.c
@@ -1515,12 +1515,12 @@ PP(pp_sort)
                }
            }
            if (!(cv && CvROOT(cv))) {
-               if (cv && CvXSUB(cv)) {
+               if (cv && CvISXSUB(cv)) {
                    is_xsub = 1;
                }
                else if (gv) {
                    SV *tmpstr = sv_newmortal();
-                   gv_efullname3(tmpstr, gv, Nullch);
+                   gv_efullname3(tmpstr, gv, NULL);
                    DIE(aTHX_ "Undefined sort subroutine \"%"SVf"\" called",
                        tmpstr);
                }
@@ -1536,7 +1536,7 @@ PP(pp_sort)
        }
     }
     else {
-       PL_sortcop = Nullop;
+       PL_sortcop = NULL;
        stash = CopSTASH(PL_curcop);
     }
 
@@ -1553,7 +1553,7 @@ PP(pp_sort)
            p2 = SP;
            for (i=0; i < max; i++) {
                SV **svp = av_fetch(av, i, FALSE);
-               *SP++ = (svp) ? *svp : Nullsv;
+               *SP++ = (svp) ? *svp : NULL;
            }
        }
        else {
@@ -1631,8 +1631,8 @@ PP(pp_sort)
                SAVESPTR(PL_firstgv);
                SAVESPTR(PL_secondgv);
                SAVESPTR(PL_sortstash);
-               PL_firstgv = gv_fetchpv("a", TRUE, SVt_PV);
-               PL_secondgv = gv_fetchpv("b", TRUE, SVt_PV);
+               PL_firstgv = gv_fetchpvs("a", GV_ADD|GV_NOTQUAL, SVt_PV);
+               PL_secondgv = gv_fetchpvs("b", GV_ADD|GV_NOTQUAL, SVt_PV);
                PL_sortstash = stash;
                SAVESPTR(GvSV(PL_firstgv));
                SAVESPTR(GvSV(PL_secondgv));
@@ -1655,10 +1655,10 @@ PP(pp_sort)
 
                    if (hasargs) {
                        /* This is mostly copied from pp_entersub */
-                       AV *av = (AV*)PAD_SVl(0);
+                       AV * const av = (AV*)PAD_SVl(0);
 
                        cx->blk_sub.savearray = GvAV(PL_defgv);
-                       GvAV(PL_defgv) = (AV*)SvREFCNT_inc(av);
+                       GvAV(PL_defgv) = (AV*)SvREFCNT_inc_simple(av);
                        CX_CURPAD_SAVE(cx->blk_sub);
                        cx->blk_sub.argarray = av;
                    }
@@ -1842,7 +1842,7 @@ S_sv_i_ncmp(pTHX_ SV *a, SV *b)
 #define tryCALL_AMAGICbin(left,right,meth) \
     (PL_amagic_generation && (SvAMAGIC(left)||SvAMAGIC(right))) \
        ? amagic_call(left, right, CAT2(meth,_amg), 0) \
-       : Nullsv;
+       : NULL;
 
 static I32
 S_amagic_ncmp(pTHX_ register SV *a, register SV *b)