From: Vincent Pit Date: Mon, 11 Aug 2008 13:59:11 +0000 (+0200) Subject: Prefer SvPV_*_const functions X-Git-Tag: v0.02~5 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=commitdiff_plain;h=1a28b9e5abd56be968ae09e9d45327632f1a28c8 Prefer SvPV_*_const functions --- diff --git a/indirect.xs b/indirect.xs index 04bc760..1e546d6 100644 --- a/indirect.xs +++ b/indirect.xs @@ -6,6 +6,14 @@ #include "perl.h" #include "XSUB.h" +#ifndef SvPV_const +# define SvPV_const SvPV +#endif + +#ifndef SvPV_nolen_const +# define SvPV_nolen_const SvPV_nolen +#endif + #ifndef SvPVX_const # define SvPVX_const SvPVX #endif @@ -59,7 +67,7 @@ STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) { char buf[32]; SV **val; - if (indirect_linestr != SvPVX(PL_parser->linestr)) + if (indirect_linestr != SvPVX_const(PL_parser->linestr)) return NULL; val = hv_fetch(indirect_map, buf, sprintf(buf, "%u", PTR2UV(o)), 0); @@ -196,7 +204,8 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) { pm = indirect_map_fetch(om, &svm); po = indirect_map_fetch(oo, &svo); if (pm && po && pm < po) - ((hint == 2) ? croak : warn)(indirect_msg, SvPV_nolen(svm), SvPV_nolen(svo)); + ((hint == 2) ? croak : warn)(indirect_msg, SvPV_nolen_const(svm), + SvPV_nolen_const(svo)); } done: