The THINKFIRST check after the GMAGICAL check in sv_2iv_flags and

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

diff --git a/regcomp.c b/regcomp.c
index d288eb0..d943d14 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -5757,6 +5757,8 @@ Perl_regdump(pTHX_ regexp *r)
            PerlIO_printf(Perl_debug_log, "\n");
         });
     }
+#else
+    PERL_UNUSED_ARG(r);
 #endif /* DEBUGGING */
 }
 
@@ -5820,8 +5822,9 @@ Perl_regprop(pTHX_ SV *sv, const regnode *o)
     else if (k == ANYOF) {
        int i, rangestart = -1;
        const U8 flags = ANYOF_FLAGS(o);
-       const char * const anyofs[] = { /* Should be synchronized with
-                                        * ANYOF_ #xdefines in regcomp.h */
+
+       /* Should be synchronized with * ANYOF_ #xdefines in regcomp.h */
+       static const char * const anyofs[] = {
            "\\w",
            "\\W",
            "\\s",
@@ -5956,6 +5959,9 @@ Perl_regprop(pTHX_ SV *sv, const regnode *o)
     }
     else if (k == BRANCHJ && (OP(o) == UNLESSM || OP(o) == IFMATCH))
        Perl_sv_catpvf(aTHX_ sv, "[-%d]", o->flags);
+#else
+    PERL_UNUSED_ARG(sv);
+    PERL_UNUSED_ARG(o);
 #endif /* DEBUGGING */
 }
 
@@ -6218,7 +6224,7 @@ Perl_save_re_context(pTHX)
            for (i = 1; i <= rx->nparens; i++) {
                GV *mgv;
                char digits[TYPE_CHARS(long)];
-               const STRLEN len = sprintf(digits, "%lu", (long)i);
+               const STRLEN len = my_sprintf(digits, "%lu", (long)i);
                if ((mgv = gv_fetchpvn_flags(digits, len, FALSE, SVt_PV)))
                    save_scalar(mgv);
            }