diff options
| author | Steve Peters <steve@fisharerojo.org> | 2005-05-20 16:42:10 -0500 |
|---|---|---|
| committer | Abhijit Menon-Sen <ams@wiw.org> | 2005-05-21 02:58:49 +0000 |
| commit | b15aece354b2aec9d338e59acb2abc2deeebc3c0 (patch) | |
| tree | cd9381dd13364c19fdc12c6a4d15a29d82e5314e /gv.c | |
| parent | 8d2f45362e368d7dd455b476c924dcbcc02d845b (diff) | |
| download | perl-b15aece354b2aec9d338e59acb2abc2deeebc3c0.tar.gz | |
SvPVX_const - patch #2
Message-Id: <20050521024210.GA29036@mccoy.peters.homeunix.org>
p4raw-id: //depot/perl@24523
Diffstat (limited to 'gv.c')
| -rw-r--r-- | gv.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -111,7 +111,7 @@ Perl_gv_init(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, int multi) dVAR; register GP *gp; const bool doproto = SvTYPE(gv) > SVt_NULL; - const char * const proto = (doproto && SvPOK(gv)) ? SvPVX(gv) : NULL; + const char * const proto = (doproto && SvPOK(gv)) ? SvPVX_const(gv) : NULL; sv_upgrade((SV*)gv, SVt_PVGV); if (SvLEN(gv)) { @@ -120,7 +120,7 @@ Perl_gv_init(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, int multi) SvLEN_set(gv, 0); SvPOK_off(gv); } else - Safefree(SvPVX(gv)); + Safefree(SvPVX_const(gv)); } Newz(602, gp, 1, GP); GvGP(gv) = gp_ref(gp); @@ -433,7 +433,7 @@ Perl_gv_fetchmethod_autoload(pTHX_ HV *stash, const char *name, I32 autoload) SV *tmpstr = sv_2mortal(Perl_newSVpvf(aTHX_ "%s::SUPER", CopSTASHPV(PL_curcop))); /* __PACKAGE__::SUPER stash should be autovivified */ - stash = gv_stashpvn(SvPVX(tmpstr), SvCUR(tmpstr), TRUE); + stash = gv_stashpvn(SvPVX_const(tmpstr), SvCUR(tmpstr), TRUE); DEBUG_o( Perl_deb(aTHX_ "Treating %s as %s::%s\n", origname, HvNAME(stash), name) ); } @@ -1415,12 +1415,12 @@ Perl_Gv_AMupdate(pTHX_ HV *stash) "' for overloaded `%s' in package `%.256s'\n", GvSV(gv), cp, HvNAME(stash)) ); if (!SvPOK(GvSV(gv)) - || !(ngv = gv_fetchmethod_autoload(stash, SvPVX(GvSV(gv)), + || !(ngv = gv_fetchmethod_autoload(stash, SvPVX_const(GvSV(gv)), FALSE))) { /* Can be an import stub (created by `can'). */ SV *gvsv = GvSV(gv); - const char *name = SvPOK(gvsv) ? SvPVX(gvsv) : "???"; + const char *name = SvPOK(gvsv) ? SvPVX_const(gvsv) : "???"; Perl_croak(aTHX_ "%s method `%.256s' overloading `%s' "\ "in package `%.256s'", (GvCVGEN(gv) ? "Stub found while resolving" @@ -1707,7 +1707,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags) HvNAME(SvSTASH(SvRV(right))): "")); if (amtp && amtp->fallback >= AMGfallYES) { - DEBUG_o( Perl_deb(aTHX_ "%s", SvPVX(msg)) ); + DEBUG_o( Perl_deb(aTHX_ "%s", SvPVX_const(msg)) ); } else { Perl_croak(aTHX_ "%"SVf, msg); } |