Re: [PATCH] sort/multicall patch

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

diff --git a/xsutils.c b/xsutils.c
index 5956ff2..8662008 100644 (file)
--- a/xsutils.c
+++ b/xsutils.c
@@ -61,7 +61,7 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 
     for (nret = 0 ; numattrs && (attr = *attrlist++); numattrs--) {
        STRLEN len;
-       const char *name = SvPV(attr, len);
+       const char *name = SvPV_const(attr, len);
        const bool negated = (*name == '-');
 
        if (negated) {
@@ -132,10 +132,11 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
                case 'e':
                    if (memEQ(name, "uniqu", 5)) {
                        if (SvTYPE(sv) == SVt_PVGV) {
-                           if (negated)
+                           if (negated) {
                                GvUNIQUE_off(sv);
-                           else
+                           } else {
                                GvUNIQUE_on(sv);
+                           }
                        }
                        /* Hope this came from toke.c if not a GV. */
                         continue;
@@ -258,7 +259,7 @@ usage:
     sv = SvRV(rv);
 
     if (SvOBJECT(sv))
-       sv_setpv(TARG, HvNAME(SvSTASH(sv)));
+       sv_setpvn(TARG, HvNAME_get(SvSTASH(sv)), HvNAMELEN_get(SvSTASH(sv)));
 #if 0  /* this was probably a bad idea */
     else if (SvPADMY(sv))
        sv_setsv(TARG, &PL_sv_no);      /* unblessed lexical */
@@ -284,7 +285,7 @@ usage:
            break;
        }
        if (stash)
-           sv_setpv(TARG, HvNAME(stash));
+           sv_setpvn(TARG, HvNAME_get(stash), HvNAMELEN_get(stash));
     }
 
     SvSETMAGIC(TARG);
@@ -305,8 +306,7 @@ usage:
 
     rv = ST(0);
     ST(0) = TARG;
-    if (SvGMAGICAL(rv))
-       mg_get(rv);
+    SvGETMAGIC(rv);
     if (!(SvOK(rv) && SvROK(rv)))
        goto usage;
     sv = SvRV(rv);