Change 29134 by nicholas@nicholas-saigo on 2006/10/29 19:28:47
Integrate:
[ 25914]
Subject: [PATCH] S_tokereport's unused parm
From: Andy Lester <andy (AT) petdance (DOT) com>
Date: Mon, 31 2005 00:04:59 -0600
Message-ID: <20051031060459.GC10767 (AT) petdance (DOT) com>
Affected files
//depot/maint-5.8/perl/embed.fnc#155 integrate
//depot/maint-5.8/perl/embed.h#117 integrate
//depot/maint-5.8/perl/proto.h#144 integrate
//depot/maint-5.8/perl/toke.c#115 integrate
Differences
//depot/maint-5.8/perl/embed.fnc#155 (text)
Index: perl/embed.fnc
perl/embed.fnc#154~29132~2006-10-29 11:16:37.000000000 -0800
perl/embed.fnc2006-10-29 11:28:47.000000000 -0800
@@ -1334,7 +1334,7 @@
s|SV*|new_constant|NULLK const char *s|STRLEN len|NN const char *key|NN SV *sv \
|NULLK SV *pv|NULLK const char *type
# if defined(DEBUGGING)
-s|int|tokereport|NN const char *s|I32 rv
+s|int|tokereport|I32 rv
# endif
s|int|ao|int toketype
s|void|depcom
//depot/maint-5.8/perl/embed.h#117 (text+w)
Index: perl/embed.h
perl/embed.h#116~29132~2006-10-29 11:16:37.000000000 -0800
perl/embed.h2006-10-29 11:28:47.000000000 -0800
@@ -3411,7 +3411,7 @@
#endif
# if defined(DEBUGGING)
#ifdef PERL_CRE
-#define tokereport(a,b)S_tokereport(aTHX_ a,b)
+#define tokereport(a)S_tokereport(aTHX_ a)
#endif
# endif
#ifdef PERL_CRE
//depot/maint-5.8/perl/proto.h#144 (text+w)
Index: perl/proto.h
perl/proto.h#143~29132~2006-10-29 11:16:37.000000000 -0800
perl/proto.h2006-10-29 11:28:47.000000000 -0800
@@ -1953,7 +1953,7 @@
STATIC SV*S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, SV *sv, SV *pv, const char *type);
# if defined(DEBUGGING)
-STATIC intS_tokereport(pTHX_ const char *s, I32 rv);
+STATIC intS_tokereport(pTHX_ I32 rv);
# endif
STATIC intS_ao(pTHX_ int toketype);
STATIC voidS_depcom(pTHX);
//depot/maint-5.8/perl/toke.c#115 (text)
Index: perl/toke.c
perl/toke.c#114~29021~2006-10-15 02:22:52.000000000 -0700
perl/toke.c2006-10-29 11:28:47.000000000 -0800
@@ -157,7 +157,7 @@
*/
#ifdef DEBUGGING /* Serve -DT. */
-# define REPRT(retval) tokereport(s,(int)retval)
+# define REPRT(retval) tokereport((I32)retval)
#else
# define REPRT(retval) (retval)
#endif
@@ -292,7 +292,7 @@
/* dump the returned token in rv, plus any optional arg in yylval */
STATIC int
-S_tokereport(pTHX_ const char* s, I32 rv)
+S_tokereport(pTHX_ I32 rv)
{
if (DEBUG_T_TEST) {
const char *name = NULL;
End of Patch.