FPTR2DPTR/DPTR2FPTR

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

diff --git a/taint.c b/taint.c
index f21aedc..6acad15 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -74,8 +74,8 @@ Perl_taint_env(pTHX)
 {
     SV** svp;
     MAGIC* mg;
-    const char** e;
-    static const char* misc_env[] = {
+    const char* const *e;
+    static const char* const misc_env[] = {
        "IFS",          /* most shells' inter-field separators */
        "CDPATH",       /* ksh dain bramage #1 */
        "ENV",          /* ksh dain bramage #2 */
@@ -143,10 +143,10 @@ Perl_taint_env(pTHX)
     /* tainted $TERM is okay if it contains no metachars */
     svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
     if (svp && *svp && SvTAINTED(*svp)) {
-       STRLEN n_a;
+       STRLEN len;
        const bool was_tainted = PL_tainted;
-       char *t = SvPV(*svp, n_a);
-       char *e = t + n_a;
+       const char *t = SvPV_const(*svp, len);
+       const char *e = t + len;
        PL_tainted = was_tainted;
        if (t < e && isALNUM(*t))
            t++;
@@ -167,3 +167,13 @@ Perl_taint_env(pTHX)
        }
     }
 }
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */