From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sat, 29 Apr 2006 11:13:24 +0000 (+0300)
Subject: more -ansi -pedantic cleanliness
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ca0270c4db0273594a19a3d140c7330546a185fe;p=p5sagit%2Fp5-mst-13.2.git

more -ansi -pedantic cleanliness
Message-ID: <44532024.9070303@gmail.com>

p4raw-id: //depot/perl@28010
---

diff --git a/cop.h b/cop.h
index a6749a0..5b6014b 100644
--- a/cop.h
+++ b/cop.h
@@ -100,7 +100,7 @@ typedef struct jmpenv JMPENV;
 #define JMPENV_PUSH(v) \
     STMT_START {							\
 	DEBUG_l(Perl_deb(aTHX_ "Setting up jumplevel %p, was %p\n",	\
-			 &cur_env, PL_top_env));			\
+			 (void*)&cur_env, (void*)PL_top_env));			\
 	cur_env.je_prev = PL_top_env;					\
 	OP_REG_TO_MEM;							\
 	cur_env.je_ret = PerlProc_setjmp(cur_env.je_buf, SCOPE_SAVES_SIGNAL_MASK);		\
@@ -113,7 +113,7 @@ typedef struct jmpenv JMPENV;
 #define JMPENV_POP \
     STMT_START {							\
 	DEBUG_l(Perl_deb(aTHX_ "popping jumplevel was %p, now %p\n",	\
-			 PL_top_env, cur_env.je_prev));			\
+			 (void*)PL_top_env, (void*)cur_env.je_prev));			\
 	PL_top_env = cur_env.je_prev;					\
     } STMT_END
 
diff --git a/gv.c b/gv.c
index 9b68820..32a3aa6 100644
--- a/gv.c
+++ b/gv.c
@@ -1526,7 +1526,7 @@ Perl_Gv_AMupdate(pTHX_ HV *stash)
 
 		DEBUG_o( Perl_deb(aTHX_ "Resolving method \"%"SVf256\
 			"\" for overloaded \"%s\" in package \"%.256s\"\n",
-			     GvSV(gv), cp, hvname) );
+			     (void*)GvSV(gv), cp, hvname) );
 		if (!gvsv || !SvPOK(gvsv)
 		    || !(ngv = gv_fetchmethod_autoload(stash, SvPVX_const(gvsv),
 						       FALSE)))
diff --git a/regcomp.c b/regcomp.c
index da245b1..6ba85bb 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1865,7 +1865,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, I32 *deltap,
                                     SvPV_nolen_const(mysv));
                                 }
                                 PerlIO_printf( Perl_debug_log, "0x%p,0x%p,0x%p)\n",
-                                   first, last, cur );
+                                   (void*)first, (void*)last, (void*)cur );
                             });
                             if ( ( first ? OP( noper ) == optype
                                          : PL_regkind[ (U8)OP( noper ) ] == EXACT )
@@ -1922,7 +1922,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, I32 *deltap,
                             regprop(RExC_rx, mysv, cur);
                             PerlIO_printf( Perl_debug_log,
                               "%*s%s\t(0x%p,0x%p,0x%p)\n", (int)depth * 2 + 2,
-                              "  ", SvPV_nolen_const( mysv ), first, last, cur);
+                              "  ", SvPV_nolen_const( mysv ), (void*)first, (void*)last, (void*)cur);
 
                         });
                         if ( last ) {
diff --git a/regexec.c b/regexec.c
index 580ad5e..c006101 100644
--- a/regexec.c
+++ b/regexec.c
@@ -2866,7 +2866,7 @@ S_regmatch(pTHX_ const regmatch_info *reginfo, regnode *prog)
     			    PerlIO_printf( Perl_debug_log, "%*s  %strying alternation #%d <%s> at 0x%p%s\n",
     			        REPORT_CODE_OFF+PL_regindent*2, "", PL_colors[4],
     			        st->u.trie.accept_buff[best].wordnum,
-        		        tmp ? SvPV_nolen_const( *tmp ) : "not compiled under -Dr",scan,
+        		        tmp ? SvPV_nolen_const( *tmp ) : "not compiled under -Dr", (void*)scan,
         		        PL_colors[5] );
 			});
 			if ( best<st->u.trie.accepted ) {
diff --git a/sv.c b/sv.c
index dab41e4..e350ade 100644
--- a/sv.c
+++ b/sv.c
@@ -693,7 +693,7 @@ Perl_get_arena(pTHX_ int arena_size)
 	newroot->set_size = ARENAS_PER_SET;
 	newroot->next = *aroot;
 	*aroot = newroot;
-	DEBUG_m(PerlIO_printf(Perl_debug_log, "new arenaset %p\n", *aroot));
+	DEBUG_m(PerlIO_printf(Perl_debug_log, "new arenaset %p\n", (void*)*aroot));
     }
 
     /* ok, now have arena-set with at least 1 empty/available arena-desc */
diff --git a/toke.c b/toke.c
index 6e80882..29d8380 100644
--- a/toke.c
+++ b/toke.c
@@ -2607,7 +2607,7 @@ Perl_filter_del(pTHX_ filter_t funcp)
     SV *datasv;
 
 #ifdef DEBUGGING
-    DEBUG_P(PerlIO_printf(Perl_debug_log, "filter_del func %p", FPTR2DPTR(XPVIO *, funcp)));
+    DEBUG_P(PerlIO_printf(Perl_debug_log, "filter_del func %p", (void*)FPTR2DPTR(XPVIO *, funcp)));
 #endif
     if (!PL_rsfp_filters || AvFILLp(PL_rsfp_filters)<0)
 	return;
@@ -2689,7 +2689,7 @@ Perl_filter_read(pTHX_ int idx, SV *buf_sv, int maxlen)
     funcp = DPTR2FPTR(filter_t, IoANY(datasv));
     DEBUG_P(PerlIO_printf(Perl_debug_log,
 			  "filter_read %d: via function %p (%s)\n",
-			  idx, datasv, SvPV_nolen_const(datasv)));
+			  idx, (void*)datasv, SvPV_nolen_const(datasv)));
     /* Call function. The function is expected to 	*/
     /* call "FILTER_READ(idx+1, buf_sv)" first.		*/
     /* Return: <0:error, =0:eof, >0:not eof 		*/
@@ -12407,7 +12407,7 @@ utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen)
     const I32 count = FILTER_READ(idx+1, sv, maxlen);
     DEBUG_P(PerlIO_printf(Perl_debug_log,
 			  "utf16_textfilter(%p): %d %d (%d)\n",
-			  utf16_textfilter, idx, maxlen, (int) count));
+			  (void*)utf16_textfilter, idx, maxlen, (int) count));
     if (count) {
 	U8* tmps;
 	I32 newlen;
@@ -12429,7 +12429,7 @@ utf16rev_textfilter(pTHX_ int idx, SV *sv, int maxlen)
     const I32 count = FILTER_READ(idx+1, sv, maxlen);
     DEBUG_P(PerlIO_printf(Perl_debug_log,
 			  "utf16rev_textfilter(%p): %d %d (%d)\n",
-			  utf16rev_textfilter, idx, maxlen, (int) count));
+			  (void*)utf16rev_textfilter, idx, maxlen, (int) count));
     if (count) {
 	U8* tmps;
 	I32 newlen;