The tokenizer should expect an operator after qw().

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

diff --git a/taint.c b/taint.c
index ec568be..209efb3 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -24,7 +24,7 @@
 void
 Perl_taint_proper(pTHX_ const char *f, const char *s)
 {
-    char *ug;
+    const char *ug;
 
 #if defined(HAS_SETEUID) && defined(DEBUGGING)
 #   if Uid_t_size == 1
@@ -74,8 +74,8 @@ Perl_taint_env(pTHX)
 {
     SV** svp;
     MAGIC* mg;
-    char** e;
-    static 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 */
@@ -90,8 +90,8 @@ Perl_taint_env(pTHX)
      * it probably doesn't reflect the actual environment */
     if (!GvHV(PL_envgv) || !(SvRMAGICAL(GvHV(PL_envgv))
            && mg_find((SV*)GvHV(PL_envgv), PERL_MAGIC_env))) {
-       bool was_tainted = PL_tainted;
-       char *name = GvENAME(PL_envgv);
+       const bool was_tainted = PL_tainted;
+        const char *name = GvENAME(PL_envgv);
        PL_tainted = TRUE;
        if (strEQ(name,"ENV"))
            /* hash alias */
@@ -144,7 +144,7 @@ Perl_taint_env(pTHX)
     svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
     if (svp && *svp && SvTAINTED(*svp)) {
        STRLEN n_a;
-       bool was_tainted = PL_tainted;
+       const bool was_tainted = PL_tainted;
        char *t = SvPV(*svp, n_a);
        char *e = t + n_a;
        PL_tainted = was_tainted;
@@ -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:
+ */