Silence some warnings
authorRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Fri, 20 Oct 2006 09:04:49 +0000 (09:04 +0000)
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Fri, 20 Oct 2006 09:04:49 +0000 (09:04 +0000)
p4raw-id: //depot/perl@29058

pp_ctl.c
regcomp.c

index 0a59e62..708f2fa 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -131,10 +131,9 @@ PP(pp_regcomp)
        if (!re || !re->precomp || re->prelen != (I32)len ||
            memNE(re->precomp, t, len))
        {
-           regexp_engine * eng = NULL;
-           
+           const regexp_engine *eng = re ? re->engine : NULL;
+
            if (re) {
-               eng = re->engine;
                ReREFCNT_dec(re);
                PM_SETRE(pm, NULL);     /* crucial if regcomp aborts */
            } else if (PL_curcop->cop_hints_hash) {
@@ -143,7 +142,7 @@ PP(pp_regcomp)
                 if (ptr && SvIOK(ptr) && SvIV(ptr))
                     eng = INT2PTR(regexp_engine*,SvIV(ptr));
            }
-               
+
            if (PL_op->op_flags & OPf_SPECIAL)
                PL_reginterp_cnt = I32_MAX; /* Mark as safe.  */
 
index 0a5f2fd..25dc17f 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -907,8 +907,8 @@ S_dump_trie_interim_list(pTHX_ const struct _reg_trie_data *trie, U32 next_alloc
                     (UV)TRIE_LIST_ITEM(state,charid).newstate
                 );
                 if (!(charid % 10)) 
-                    PerlIO_printf( Perl_debug_log, "\n%*s| ",
-                        (depth * 2) + 14,"");
+                    PerlIO_printf(Perl_debug_log, "\n%*s| ",
+                        (int)((depth * 2) + 14), "");
             }
         }
         PerlIO_printf( Perl_debug_log, "\n");