Use pvs macros instead of pvn where possible.

[perl5.git] / gv.c

diff --git a/gv.c b/gv.c
index 9d37308..77c65a4 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -1120,7 +1120,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
            if (USE_UTF8_IN_NAMES)
                SvUTF8_on(err);
            qerror(err);
-           gv = gv_fetchpvn_flags("<none>::", 8, GV_ADDMULTI, SVt_PVHV);
+           gv = gv_fetchpvs("<none>::", GV_ADDMULTI, SVt_PVHV);
            if(!gv) {
                /* symbol table under destruction */
                return NULL;
@@ -1210,15 +1210,15 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
                        && AvFILLp(av) == -1)
                        {
                            const char *pname;
-                           av_push(av, newSVpvn(pname = "NDBM_File",9));
+                           av_push(av, newSVpvs(pname = "NDBM_File"));
                            gv_stashpvn(pname, 9, GV_ADD);
-                           av_push(av, newSVpvn(pname = "DB_File",7));
+                           av_push(av, newSVpvs(pname = "DB_File"));
                            gv_stashpvn(pname, 7, GV_ADD);
-                           av_push(av, newSVpvn(pname = "GDBM_File",9));
+                           av_push(av, newSVpvs(pname = "GDBM_File"));
                            gv_stashpvn(pname, 9, GV_ADD);
-                           av_push(av, newSVpvn(pname = "SDBM_File",9));
+                           av_push(av, newSVpvs(pname = "SDBM_File"));
                            gv_stashpvn(pname, 9, GV_ADD);
-                           av_push(av, newSVpvn(pname = "ODBM_File",9));
+                           av_push(av, newSVpvs(pname = "ODBM_File"));
                            gv_stashpvn(pname, 9, GV_ADD);
                        }
                }
@@ -1425,11 +1425,11 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
            break;
 
        case '\014':    /* $^L */
-           sv_setpvn(GvSVn(gv),"\f",1);
+           sv_setpvs(GvSVn(gv),"\f");
            PL_formfeed = GvSVn(gv);
            break;
        case ';':
-           sv_setpvn(GvSVn(gv),"\034",1);
+           sv_setpvs(GvSVn(gv),"\034");
            break;
        case ']':
        {
@@ -1764,10 +1764,10 @@ Perl_Gv_AMupdate(pTHX_ HV *stash)
            if (i < DESTROY_amg)
                have_ovl = 1;
        } else if (gv) {                /* Autoloaded... */
-           cv = (CV*)gv;
+           cv = MUTABLE_CV(gv);
            filled = 1;
        }
-       amt.table[i]=(CV*)SvREFCNT_inc_simple(cv);
+       amt.table[i]=MUTABLE_CV(SvREFCNT_inc_simple(cv));
     }
     if (filled) {
       AMT_AMAGIC_on(&amt);