Change 29897 by [EMAIL PROTECTED] on 2007/01/20 18:14:46
Integrate:
[ 27178]
Remove a my_perl that slipped in
[ 27300]
Subject: [PATCH] unused context warnings
From: [EMAIL PROTECTED] (Andy Lester)
Date: Tue, 21 Feb 2006 00:27:11 -0600
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/deb.c#19 integrate
... //depot/maint-5.8/perl/embed.pl#31 integrate
... //depot/maint-5.8/perl/hv.c#98 integrate
... //depot/maint-5.8/perl/locale.c#23 integrate
... //depot/maint-5.8/perl/mathoms.c#19 integrate
... //depot/maint-5.8/perl/mg.c#124 integrate
... //depot/maint-5.8/perl/miniperlmain.c#14 integrate
... //depot/maint-5.8/perl/numeric.c#24 integrate
... //depot/maint-5.8/perl/op.c#161 integrate
... //depot/maint-5.8/perl/perl.c#186 integrate
... //depot/maint-5.8/perl/perl.h#130 integrate
... //depot/maint-5.8/perl/perlapi.c#13 integrate
... //depot/maint-5.8/perl/perlio.c#84 integrate
... //depot/maint-5.8/perl/pp_ctl.c#144 integrate
... //depot/maint-5.8/perl/regcomp.c#80 integrate
... //depot/maint-5.8/perl/scope.c#53 integrate
... //depot/maint-5.8/perl/sv.c#293 integrate
... //depot/maint-5.8/perl/toke.c#135 integrate
... //depot/maint-5.8/perl/universal.c#56 integrate
... //depot/maint-5.8/perl/utf8.c#65 integrate
... //depot/maint-5.8/perl/util.c#122 integrate
Differences ...
==== //depot/maint-5.8/perl/deb.c#19 (text) ====
Index: perl/deb.c
--- perl/deb.c#18~29888~ 2007-01-19 13:24:46.000000000 -0800
+++ perl/deb.c 2007-01-20 10:14:46.000000000 -0800
@@ -47,6 +47,7 @@
vdeb(pat, &args);
va_end(args);
#else
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(pat);
#endif /* DEBUGGING */
}
@@ -68,6 +69,7 @@
#endif /* USE_5005THREADS */
(void) PerlIO_vprintf(Perl_debug_log, pat, *args);
#else
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(pat);
PERL_UNUSED_ARG(args);
#endif /* DEBUGGING */
@@ -137,6 +139,7 @@
while (1);
PerlIO_printf(Perl_debug_log, "\n");
#else
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(stack_base);
PERL_UNUSED_ARG(stack_min);
PERL_UNUSED_ARG(stack_max);
@@ -310,6 +313,8 @@
} /* next stackinfo */
PerlIO_printf(Perl_debug_log, "\n");
+#else
+ PERL_UNUSED_CONTEXT;
#endif /* DEBUGGING */
}
==== //depot/maint-5.8/perl/embed.pl#31 (xtext) ====
Index: perl/embed.pl
--- perl/embed.pl#30~29862~ 2007-01-17 14:53:30.000000000 -0800
+++ perl/embed.pl 2007-01-20 10:14:46.000000000 -0800
@@ -895,9 +895,9 @@
#undef PERLVARIC
#define PERLVAR(v,t) t* Perl_##v##_ptr(pTHX) \
- { return &(aTHX->v); }
+ { PERL_UNUSED_CONTEXT; return &(aTHX->v); }
#define PERLVARA(v,n,t) PL_##v##_t* Perl_##v##_ptr(pTHX)
\
- { return &(aTHX->v); }
+ { PERL_UNUSED_CONTEXT; return &(aTHX->v); }
#define PERLVARI(v,t,i) PERLVAR(v,t)
#define PERLVARIC(v,t,i) PERLVAR(v, const t)
@@ -908,12 +908,12 @@
#undef PERLVAR
#undef PERLVARA
#define PERLVAR(v,t) t* Perl_##v##_ptr(pTHX) \
- { return &(PL_##v); }
+ { PERL_UNUSED_CONTEXT; return &(PL_##v); }
#define PERLVARA(v,n,t) PL_##v##_t* Perl_##v##_ptr(pTHX)
\
- { return &(PL_##v); }
+ { PERL_UNUSED_CONTEXT; return &(PL_##v); }
#undef PERLVARIC
#define PERLVARIC(v,t,i) const t* Perl_##v##_ptr(pTHX) \
- { return (const t *)&(PL_##v); }
+ { PERL_UNUSED_CONTEXT; return (const t *)&(PL_##v); }
#include "perlvars.h"
#undef PERLVAR
==== //depot/maint-5.8/perl/locale.c#23 (text) ====
Index: perl/locale.c
--- perl/locale.c#22~29802~ 2007-01-13 16:36:51.000000000 -0800
+++ perl/locale.c 2007-01-20 10:14:46.000000000 -0800
@@ -180,6 +180,7 @@
#endif /* USE_LOCALE_CTYPE */
PERL_UNUSED_ARG(newctype);
+ PERL_UNUSED_CONTEXT;
}
/*
==== //depot/maint-5.8/perl/mathoms.c#19 (text) ====
Index: perl/mathoms.c
--- perl/mathoms.c#18~29859~ 2007-01-17 14:07:40.000000000 -0800
+++ perl/mathoms.c 2007-01-20 10:14:46.000000000 -0800
@@ -1100,6 +1100,7 @@
void
Perl_sv_nolocking(pTHX_ SV *sv)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(sv);
}
@@ -1119,6 +1120,7 @@
void
Perl_sv_nounlocking(pTHX_ SV *sv)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(sv);
}
==== //depot/maint-5.8/perl/mg.c#124 (text) ====
Index: perl/mg.c
--- perl/mg.c#123~29888~ 2007-01-19 13:24:46.000000000 -0800
+++ perl/mg.c 2007-01-20 10:14:46.000000000 -0800
@@ -122,6 +122,7 @@
Perl_mg_magical(pTHX_ SV *sv)
{
const MAGIC* mg;
+ PERL_UNUSED_CONTEXT;
for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
const MGVTBL* const vtbl = mg->mg_virtual;
if (vtbl) {
@@ -351,6 +352,7 @@
MAGIC*
Perl_mg_find(pTHX_ SV *sv, int type)
{
+ PERL_UNUSED_CONTEXT;
if (sv) {
MAGIC *mg;
for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
@@ -2085,6 +2087,7 @@
int
Perl_magic_setmglob(pTHX_ SV *sv, MAGIC *mg)
{
+ PERL_UNUSED_CONTEXT;
mg->mg_len = -1;
SvSCREAM_off(sv);
return 0;
@@ -2144,6 +2147,7 @@
* RenE<eacute> Descartes said "I think not."
* and vanished with a faint plop.
*/
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(sv);
if (mg->mg_ptr) {
Safefree(mg->mg_ptr);
@@ -2158,6 +2162,7 @@
int
Perl_magic_setutf8(pTHX_ SV *sv, MAGIC *mg)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(sv);
Safefree(mg->mg_ptr); /* The mg_ptr holds the pos cache. */
mg->mg_ptr = 0;
@@ -2648,6 +2653,7 @@
Perl_whichsig(pTHX_ char *sig)
{
register const char * const *sigv;
+ PERL_UNUSED_CONTEXT;
for (sigv = PL_sig_name; *sigv; sigv++)
if (strEQ(sig,*sigv))
==== //depot/maint-5.8/perl/miniperlmain.c#14 (text) ====
Index: perl/miniperlmain.c
--- perl/miniperlmain.c#13~29846~ 2007-01-17 03:36:40.000000000 -0800
+++ perl/miniperlmain.c 2007-01-20 10:14:46.000000000 -0800
@@ -128,6 +128,7 @@
static void
xs_init(pTHX)
{
+ PERL_UNUSED_CONTEXT;
dXSUB_SYS;
}
==== //depot/maint-5.8/perl/numeric.c#24 (text) ====
Index: perl/numeric.c
--- perl/numeric.c#23~29752~ 2007-01-11 04:41:42.000000000 -0800
+++ perl/numeric.c 2007-01-20 10:14:46.000000000 -0800
@@ -30,6 +30,7 @@
U32
Perl_cast_ulong(pTHX_ NV f)
{
+ PERL_UNUSED_CONTEXT;
if (f < 0.0)
return f < I32_MIN ? (U32) I32_MIN : (U32)(I32) f;
if (f < U32_MAX_P1) {
@@ -48,6 +49,7 @@
I32
Perl_cast_i32(pTHX_ NV f)
{
+ PERL_UNUSED_CONTEXT;
if (f < I32_MAX_P1)
return f < I32_MIN ? I32_MIN : (I32) f;
if (f < U32_MAX_P1) {
@@ -66,6 +68,7 @@
IV
Perl_cast_iv(pTHX_ NV f)
{
+ PERL_UNUSED_CONTEXT;
if (f < IV_MAX_P1)
return f < IV_MIN ? IV_MIN : (IV) f;
if (f < UV_MAX_P1) {
@@ -85,6 +88,7 @@
UV
Perl_cast_uv(pTHX_ NV f)
{
+ PERL_UNUSED_CONTEXT;
if (f < 0.0)
return f < IV_MIN ? (UV) IV_MIN : (UV)(IV) f;
if (f < UV_MAX_P1) {
==== //depot/maint-5.8/perl/op.c#161 (text) ====
Index: perl/op.c
--- perl/op.c#160~29896~ 2007-01-20 09:47:00.000000000 -0800
+++ perl/op.c 2007-01-20 10:14:46.000000000 -0800
@@ -554,12 +554,14 @@
void
Perl_op_refcnt_lock(pTHX)
{
+ PERL_UNUSED_CONTEXT;
OP_REFCNT_LOCK;
}
void
Perl_op_refcnt_unlock(pTHX)
{
+ PERL_UNUSED_CONTEXT;
OP_REFCNT_UNLOCK;
}
@@ -1816,6 +1818,7 @@
OP *
Perl_sawparens(pTHX_ OP *o)
{
+ PERL_UNUSED_CONTEXT;
if (o)
o->op_flags |= OPf_PARENS;
return o;
@@ -4187,7 +4190,7 @@
CvCONST_off(cv);
}
if (CvXSUB(cv)) {
- CvXSUB(cv) = 0;
+ CvXSUB(cv) = NULL;
}
/* delete all flags except WEAKOUTSIDE */
CvFLAGS(cv) &= CVf_WEAKOUTSIDE;
@@ -4237,6 +4240,7 @@
SV *
Perl_cv_const_sv(pTHX_ CV *cv)
{
+ PERL_UNUSED_CONTEXT;
if (!cv)
return NULL;
if (!(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM))
@@ -5067,6 +5071,7 @@
Perl_ck_concat(pTHX_ OP *o)
{
const OP * const kid = cUNOPo->op_first;
+ PERL_UNUSED_CONTEXT;
if (kid->op_type == OP_CONCAT && !(kid->op_private & OPpTARGET_MY) &&
!(kUNOP->op_first->op_flags & OPf_MOD))
o->op_flags |= OPf_STACKED;
@@ -5913,6 +5918,7 @@
OP *
Perl_ck_null(pTHX_ OP *o)
{
+ PERL_UNUSED_CONTEXT;
return o;
}
@@ -6518,6 +6524,7 @@
OP *
Perl_ck_svconst(pTHX_ OP *o)
{
+ PERL_UNUSED_CONTEXT;
SvREADONLY_on(cSVOPo->op_sv);
return o;
}
==== //depot/maint-5.8/perl/perl.c#186 (text) ====
Index: perl/perl.c
--- perl/perl.c#185~29888~ 2007-01-19 13:24:46.000000000 -0800
+++ perl/perl.c 2007-01-20 10:14:46.000000000 -0800
@@ -250,7 +250,7 @@
#endif /* FAKE_THREADS */
#endif /* USE_5005THREADS */
- PERL_UNUSED_ARG(my_perl);
+ PERL_UNUSED_CONTEXT;
#ifdef MULTIPLICITY
init_interp();
PL_perl_destruct_level = 1;
@@ -433,6 +433,7 @@
int
Perl_nothreadhook(pTHX)
{
+ PERL_UNUSED_CONTEXT;
return 0;
}
@@ -555,7 +556,7 @@
dTHX;
#endif /* USE_5005THREADS */
- PERL_UNUSED_ARG(my_perl);
+ PERL_UNUSED_CONTEXT;
/* wait for all pseudo-forked children to finish */
PERL_WAIT_FOR_CHILDREN;
@@ -2366,7 +2367,7 @@
dTHX;
#endif
- PERL_UNUSED_ARG(my_perl);
+ PERL_UNUSED_CONTEXT;
oldscope = PL_scopestack_ix;
#ifdef VMS
==== //depot/maint-5.8/perl/perl.h#130 (text) ====
Index: perl/perl.h
--- perl/perl.h#129~29891~ 2007-01-19 16:30:02.000000000 -0800
+++ perl/perl.h 2007-01-20 10:14:46.000000000 -0800
@@ -193,6 +193,12 @@
# define PERL_UNUSED_VAR(x) ((void)x)
#endif
+#ifdef USE_ITHREADS
+# define PERL_UNUSED_CONTEXT PERL_UNUSED_ARG(my_perl)
+#else
+# define PERL_UNUSED_CONTEXT
+#endif
+
#define NOOP (void)0
#define dNOOP extern int Perl___notused PERL_UNUSED_DECL
==== //depot/maint-5.8/perl/perlapi.c#13 (text+w) ====
Index: perl/perlapi.c
--- perl/perlapi.c#12~27040~ 2006-02-01 10:08:07.000000000 -0800
+++ perl/perlapi.c 2007-01-20 10:14:46.000000000 -0800
@@ -37,9 +37,9 @@
#undef PERLVARIC
#define PERLVAR(v,t) t* Perl_##v##_ptr(pTHX) \
- { return &(aTHX->v); }
+ { PERL_UNUSED_CONTEXT; return &(aTHX->v); }
#define PERLVARA(v,n,t) PL_##v##_t* Perl_##v##_ptr(pTHX)
\
- { return &(aTHX->v); }
+ { PERL_UNUSED_CONTEXT; return &(aTHX->v); }
#define PERLVARI(v,t,i) PERLVAR(v,t)
#define PERLVARIC(v,t,i) PERLVAR(v, const t)
@@ -50,12 +50,12 @@
#undef PERLVAR
#undef PERLVARA
#define PERLVAR(v,t) t* Perl_##v##_ptr(pTHX) \
- { return &(PL_##v); }
+ { PERL_UNUSED_CONTEXT; return &(PL_##v); }
#define PERLVARA(v,n,t) PL_##v##_t* Perl_##v##_ptr(pTHX)
\
- { return &(PL_##v); }
+ { PERL_UNUSED_CONTEXT; return &(PL_##v); }
#undef PERLVARIC
#define PERLVARIC(v,t,i) const t* Perl_##v##_ptr(pTHX) \
- { return (const t *)&(PL_##v); }
+ { PERL_UNUSED_CONTEXT; return (const t *)&(PL_##v); }
#include "perlvars.h"
#undef PERLVAR
==== //depot/maint-5.8/perl/perlio.c#84 (text) ====
Index: perl/perlio.c
--- perl/perlio.c#83~29896~ 2007-01-20 09:47:00.000000000 -0800
+++ perl/perlio.c 2007-01-20 10:14:46.000000000 -0800
@@ -360,6 +360,7 @@
void
PerlIO_init(pTHX)
{
+ PERL_UNUSED_CONTEXT;
/*
* Does nothing (yet) except force this file to be included in perl
* binary. That allows this file to force inclusion of other functions
@@ -397,6 +398,7 @@
void
PerlIO_init(pTHX)
{
+ PERL_UNUSED_CONTEXT;
/*
* Force this file to be included in perl binary. Which allows this
* file to force inclusion of other functions that may be required by
@@ -577,6 +579,7 @@
PerlIO_list_alloc(pTHX)
{
PerlIO_list_t *list;
+ PERL_UNUSED_CONTEXT;
Newxz(list, 1, PerlIO_list_t);
list->refcnt = 1;
return list;
@@ -1819,6 +1822,7 @@
IV
PerlIOUtf8_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs
*tab)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(mode);
PERL_UNUSED_ARG(arg);
if (PerlIOValid(f)) {
@@ -1986,6 +1990,7 @@
PerlIOBase_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs
*tab)
{
PerlIOl * const l = PerlIOBase(f);
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(arg);
l->flags &= ~(PERLIO_F_CANREAD | PERLIO_F_CANWRITE |
@@ -2044,6 +2049,7 @@
IV
PerlIOBase_popped(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(f);
return 0;
}
@@ -2100,6 +2106,7 @@
IV
PerlIOBase_noop_ok(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(f);
return 0;
}
@@ -2107,6 +2114,7 @@
IV
PerlIOBase_noop_fail(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(f);
return -1;
}
@@ -2143,6 +2151,7 @@
IV
PerlIOBase_eof(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
if (PerlIOValid(f)) {
return (PerlIOBase(f)->flags & PERLIO_F_EOF) != 0;
}
@@ -2152,6 +2161,7 @@
IV
PerlIOBase_error(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
if (PerlIOValid(f)) {
return (PerlIOBase(f)->flags & PERLIO_F_ERROR) != 0;
}
@@ -2172,6 +2182,7 @@
void
PerlIOBase_setlinebuf(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
if (PerlIOValid(f)) {
PerlIOBase(f)->flags |= PERLIO_F_LINEBUF;
}
@@ -2237,7 +2248,7 @@
#ifdef USE_THREADS
MUTEX_INIT(&PerlIO_mutex);
#else
- PERL_UNUSED_ARG(my_perl);
+ PERL_UNUSED_CONTEXT;
#endif
}
@@ -2372,6 +2383,7 @@
IV
PerlIOUnix_fileno(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
return PerlIOSelf(f, PerlIOUnix)->fd;
}
@@ -2394,6 +2406,7 @@
s->fd = fd;
s->oflags = imode;
PerlIOUnix_refcnt_inc(fd);
+ PERL_UNUSED_CONTEXT;
}
IV
@@ -2421,6 +2434,7 @@
{
const int fd = PerlIOSelf(f, PerlIOUnix)->fd;
Off_t new_loc;
+ PERL_UNUSED_CONTEXT;
if (PerlIOBase(f)->flags & PERLIO_F_NOTREG) {
#ifdef ESPIPE
SETERRNO(ESPIPE, LIB_INVARG);
@@ -2562,6 +2576,8 @@
Off_t
PerlIOUnix_tell(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
+
return PerlLIO_lseek(PerlIOSelf(f, PerlIOUnix)->fd, 0, SEEK_CUR);
}
@@ -2646,6 +2662,8 @@
IV
PerlIOStdio_fileno(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
+
if (PerlIOValid(f)) {
FILE * const s = PerlIOSelf(f, PerlIOStdio)->stdio;
if (s)
@@ -2867,6 +2885,8 @@
static int
PerlIOStdio_invalidate_fileno(pTHX_ FILE *f)
{
+ PERL_UNUSED_CONTEXT;
+
/* XXX this could use PerlIO_canset_fileno() and
* PerlIO_set_fileno() support from Configure
*/
@@ -3146,6 +3166,8 @@
PerlIOStdio_seek(pTHX_ PerlIO *f, Off_t offset, int whence)
{
FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
+ PERL_UNUSED_CONTEXT;
+
return PerlSIO_fseek(stdio, offset, whence);
}
@@ -3153,6 +3175,8 @@
PerlIOStdio_tell(pTHX_ PerlIO *f)
{
FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
+ PERL_UNUSED_CONTEXT;
+
return PerlSIO_ftell(stdio);
}
@@ -3160,6 +3184,8 @@
PerlIOStdio_flush(pTHX_ PerlIO *f)
{
FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
+ PERL_UNUSED_CONTEXT;
+
if (PerlIOBase(f)->flags & PERLIO_F_CANWRITE) {
return PerlSIO_fflush(stdio);
}
@@ -3186,24 +3212,32 @@
IV
PerlIOStdio_eof(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
+
return PerlSIO_feof(PerlIOSelf(f, PerlIOStdio)->stdio);
}
IV
PerlIOStdio_error(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
+
return PerlSIO_ferror(PerlIOSelf(f, PerlIOStdio)->stdio);
}
void
PerlIOStdio_clearerr(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
+
PerlSIO_clearerr(PerlIOSelf(f, PerlIOStdio)->stdio);
}
void
PerlIOStdio_setlinebuf(pTHX_ PerlIO *f)
{
+ PERL_UNUSED_CONTEXT;
+
#ifdef HAS_SETLINEBUF
PerlSIO_setlinebuf(PerlIOSelf(f, PerlIOStdio)->stdio);
#else
@@ -3288,6 +3322,8 @@
{
FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
int c;
+ PERL_UNUSED_CONTEXT;
+
/*
* fflush()ing read-only streams can cause trouble on some stdio-s
*/
@@ -3893,6 +3929,8 @@
PerlIOBuf_get_base(pTHX_ PerlIO *f)
{
PerlIOBuf * const b = PerlIOSelf(f, PerlIOBuf);
+ PERL_UNUSED_CONTEXT;
+
if (!b->buf) {
if (!b->bufsiz)
b->bufsiz = 4096;
==== //depot/maint-5.8/perl/pp_ctl.c#144 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c#143~29896~ 2007-01-20 09:47:00.000000000 -0800
+++ perl/pp_ctl.c 2007-01-20 10:14:46.000000000 -0800
@@ -266,6 +266,7 @@
{
UV *p = (UV*)*rsp;
U32 i;
+ PERL_UNUSED_CONTEXT;
if (!p || p[1] < rx->nparens) {
i = 6 + rx->nparens * 2;
@@ -294,6 +295,7 @@
{
UV *p = (UV*)*rsp;
U32 i;
+ PERL_UNUSED_CONTEXT;
if (RX_MATCH_COPIED(rx))
Safefree(rx->subbeg);
@@ -314,6 +316,7 @@
Perl_rxres_free(pTHX_ void **rsp)
{
UV * const p = (UV*)*rsp;
+ PERL_UNUSED_CONTEXT;
if (p) {
#ifdef PERL_POISON
==== //depot/maint-5.8/perl/regcomp.c#80 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c#79~29896~ 2007-01-20 09:47:00.000000000 -0800
+++ perl/regcomp.c 2007-01-20 10:14:46.000000000 -0800
@@ -4665,6 +4665,7 @@
PerlIO_printf(Perl_debug_log, "\n");
}
#else
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(r);
#endif /* DEBUGGING */
}
@@ -4857,6 +4858,7 @@
else if (k == BRANCHJ && (OP(o) == UNLESSM || OP(o) == IFMATCH))
Perl_sv_catpvf(aTHX_ sv, "[-%d]", o->flags);
#else
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(sv);
PERL_UNUSED_ARG(o);
#endif /* DEBUGGING */
==== //depot/maint-5.8/perl/scope.c#53 (text) ====
Index: perl/scope.c
--- perl/scope.c#52~29807~ 2007-01-14 05:09:22.000000000 -0800
+++ perl/scope.c 2007-01-20 10:14:46.000000000 -0800
@@ -1125,6 +1125,7 @@
break;
}
#else
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(cx);
#endif /* DEBUGGING */
}
==== //depot/maint-5.8/perl/sv.c#293 (text) ====
Index: perl/sv.c
--- perl/sv.c#292~29896~ 2007-01-20 09:47:00.000000000 -0800
+++ perl/sv.c 2007-01-20 10:14:46.000000000 -0800
@@ -392,6 +392,8 @@
{
#ifdef DEBUGGING
visit(do_report_used, 0, 0);
+#else
+ PERL_UNUSED_CONTEXT;
#endif
}
@@ -1010,7 +1012,7 @@
S_more_bodies (pTHX_ svtype sv_type)
{
void ** const root = &PL_body_roots[sv_type];
- const struct body_details *bdp = &bodies_by_type[sv_type];
+ const struct body_details * const bdp = &bodies_by_type[sv_type];
const size_t body_size = bdp->body_size;
char *start;
const char *end;
@@ -1350,6 +1352,7 @@
int
Perl_sv_backoff(pTHX_ register SV *sv)
{
+ PERL_UNUSED_CONTEXT;
assert(SvOOK(sv));
if (SvIVX(sv)) {
const char * const s = SvPVX_const(sv);
@@ -4635,6 +4638,7 @@
SV *
Perl_sv_newref(pTHX_ SV *sv)
{
+ PERL_UNUSED_CONTEXT;
if (sv)
ATOMIC_INC(SvREFCNT(sv));
return sv;
@@ -8990,6 +8994,7 @@
DIR *
Perl_dirp_dup(pTHX_ DIR *dp)
{
+ PERL_UNUSED_CONTEXT;
if (!dp)
return (DIR*)NULL;
/* XXX TODO */
@@ -9101,6 +9106,8 @@
Perl_ptr_table_new(pTHX)
{
PTR_TBL_t *tbl;
+ PERL_UNUSED_CONTEXT;
+
Newxz(tbl, 1, PTR_TBL_t);
tbl->tbl_max = 511;
tbl->tbl_items = 0;
@@ -9138,6 +9145,7 @@
Perl_ptr_table_fetch(pTHX_ PTR_TBL_t *tbl, void *sv)
{
PTR_TBL_ENT_t const *const tblent = ptr_table_find(tbl, (const void *)sv);
+ PERL_UNUSED_CONTEXT;
return tblent ? tblent->newval : (void *) 0;
}
@@ -9147,6 +9155,7 @@
Perl_ptr_table_store(pTHX_ PTR_TBL_t *tbl, void *oldsv, void *newsv)
{
PTR_TBL_ENT_t *tblent = S_ptr_table_find(tbl, (const void *)oldsv);
+ PERL_UNUSED_CONTEXT;
if (tblent) {
tblent->newval = newsv;
@@ -9174,6 +9183,7 @@
const UV oldsize = tbl->tbl_max + 1;
UV newsize = oldsize * 2;
UV i;
+ PERL_UNUSED_CONTEXT;
Renew(ary, newsize, PTR_TBL_ENT_t*);
Zero(&ary[oldsize], newsize-oldsize, PTR_TBL_ENT_t*);
==== //depot/maint-5.8/perl/toke.c#135 (text) ====
Index: perl/toke.c
--- perl/toke.c#134~29896~ 2007-01-20 09:47:00.000000000 -0800
+++ perl/toke.c 2007-01-20 10:14:46.000000000 -0800
@@ -1186,7 +1186,7 @@
if (SvTYPE(sv) == SVt_PVIV) {
/* Overloaded constants, nothing fancy: Convert to SVt_PV: */
STRLEN len;
- const char *p = SvPV_const(sv, len);
+ const char * const p = SvPV_const(sv, len);
SV * const nsv = newSVpvn(p, len);
if (SvUTF8(sv))
SvUTF8_on(nsv);
@@ -9343,6 +9343,7 @@
void
Perl_pmflag(pTHX_ U32* pmfl, int ch)
{
+ PERL_UNUSED_CONTEXT;
if (ch == 'i')
*pmfl |= PMf_FOLD;
else if (ch == 'g')
@@ -10707,7 +10708,7 @@
PL_cshlen = strlen(PL_cshname);
#else
#if defined(USE_ITHREADS)
- PERL_UNUSED_ARG(my_perl);
+ PERL_UNUSED_CONTEXT;
#endif
#endif
}
==== //depot/maint-5.8/perl/universal.c#56 (text) ====
Index: perl/universal.c
--- perl/universal.c#55~29858~ 2007-01-17 13:17:52.000000000 -0800
+++ perl/universal.c 2007-01-20 10:14:46.000000000 -0800
@@ -541,6 +541,7 @@
XS(XS_Regexp_DESTROY)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(cv);
}
==== //depot/maint-5.8/perl/utf8.c#65 (text) ====
Index: perl/utf8.c
--- perl/utf8.c#64~29896~ 2007-01-20 09:47:00.000000000 -0800
+++ perl/utf8.c 2007-01-20 10:14:46.000000000 -0800
@@ -238,6 +238,7 @@
Perl_is_utf8_char(pTHX_ U8 *s)
{
const STRLEN len = UTF8SKIP(s);
+ PERL_UNUSED_CONTEXT;
#ifdef IS_UTF8_CHAR
if (IS_UTF8_CHAR_FAST(len))
return IS_UTF8_CHAR(s, len) ? len : 0;
@@ -264,6 +265,7 @@
const U8* x = s;
const U8* send;
+ PERL_UNUSED_CONTEXT;
if (!len)
len = strlen((const char *)s);
send = s + len;
@@ -329,6 +331,7 @@
const U8* x = s;
const U8* send;
STRLEN c;
+ PERL_UNUSED_CONTEXT;
if (!len)
len = strlen((const char *)s);
@@ -717,6 +720,7 @@
U8 *
Perl_utf8_hop(pTHX_ U8 *s, I32 off)
{
+ PERL_UNUSED_CONTEXT;
/* Note: cannot use UTF8_IS_...() too eagerly here since e.g
* the bitops (especially ~) can create illegal UTF-8.
* In other words: in Perl UTF-8 is not just for Unicode. */
@@ -798,6 +802,7 @@
I32 count = 0;
const U8 *s2;
+ PERL_UNUSED_CONTEXT;
if (!*is_utf8)
return (U8 *)start;
@@ -850,6 +855,7 @@
const U8 * const send = s + (*len);
U8 *d;
U8 *dst;
+ PERL_UNUSED_CONTEXT;
Newx(d, (*len) * 2 + 1, U8);
dst = d;
==== //depot/maint-5.8/perl/util.c#122 (text) ====
Index: perl/util.c
--- perl/util.c#121~29888~ 2007-01-19 13:24:46.000000000 -0800
+++ perl/util.c 2007-01-20 10:14:46.000000000 -0800
@@ -337,6 +337,7 @@
Perl_delimcpy(pTHX_ register char *to, register char *toend, register char
*from, register char *fromend, register int delim, I32 *retlen)
{
register I32 tolen;
+ PERL_UNUSED_CONTEXT;
for (tolen = 0; from < fromend; from++, tolen++) {
if (*from == '\\') {
if (from[1] == delim)
@@ -366,6 +367,7 @@
Perl_instr(pTHX_ register const char *big, register const char *little)
{
register I32 first;
+ PERL_UNUSED_CONTEXT;
if (!little)
return (char*)big;
@@ -397,6 +399,7 @@
char *
Perl_ninstr(pTHX_ const char *big, const char *bigend, const char *little,
const char *lend)
{
+ PERL_UNUSED_CONTEXT;
if (little >= lend)
return (char*)big;
{
@@ -425,6 +428,7 @@
register const char *bigbeg;
register const I32 first = *little;
register const char * const littleend = lend;
+ PERL_UNUSED_CONTEXT;
if (little >= littleend)
return (char*)bigend;
@@ -824,6 +828,8 @@
{
register const U8 *a = (const U8 *)s1;
register const U8 *b = (const U8 *)s2;
+ PERL_UNUSED_CONTEXT;
+
while (len--) {
if (*a != *b && *a != PL_fold[*b])
return 1;
@@ -837,6 +843,8 @@
{
register const U8 *a = (const U8 *)s1;
register const U8 *b = (const U8 *)s2;
+ PERL_UNUSED_CONTEXT;
+
while (len--) {
if (*a != *b && *a != PL_fold_locale[*b])
return 1;
@@ -863,6 +871,7 @@
char *
Perl_savepv(pTHX_ const char *pv)
{
+ PERL_UNUSED_CONTEXT;
if (!pv)
return NULL;
else {
@@ -871,7 +880,6 @@
Newx(newaddr,pvlen,char);
return memcpy(newaddr,pv,pvlen);
}
-
}
/* same thing but with a known length */
@@ -891,6 +899,7 @@
Perl_savepvn(pTHX_ const char *pv, register I32 len)
{
register char *newaddr;
+ PERL_UNUSED_CONTEXT;
Newx(newaddr,len+1,char);
/* Give a meaning to NULL pointer mainly for the use in sv_magic() */
@@ -1649,6 +1658,7 @@
{
register I32 i;
register const I32 len = strlen(nam);
+ PERL_UNUSED_CONTEXT;
for (i = 0; environ[i]; i++) {
if (
@@ -2539,6 +2549,7 @@
Perl_rsignal_state(pTHX_ int signo)
{
struct sigaction oact;
+ PERL_UNUSED_CONTEXT;
if (sigaction(signo, (struct sigaction *)NULL, &oact) == -1)
return (Sighandler_t) SIG_ERR;
@@ -2841,6 +2852,7 @@
{
register I32 todo;
register const char * const frombase = from;
+ PERL_UNUSED_CONTEXT;
if (len == 1) {
register const char c = *from;
@@ -3463,18 +3475,21 @@
char **
Perl_get_op_names(pTHX)
{
- return (char **)PL_op_name;
+ PERL_UNUSED_CONTEXT;
+ return (char **)PL_op_name;
}
char **
Perl_get_op_descs(pTHX)
{
- return (char **)PL_op_desc;
+ PERL_UNUSED_CONTEXT;
+ return (char **)PL_op_desc;
}
char *
Perl_get_no_modify(pTHX)
{
+ PERL_UNUSED_CONTEXT;
/* Cast because we're not changing function prototypes in maint. */
return (char *) PL_no_modify;
}
@@ -3482,13 +3497,15 @@
U32 *
Perl_get_opargs(pTHX)
{
- return (U32 *)PL_opargs;
+ PERL_UNUSED_CONTEXT;
+ return (U32 *)PL_opargs;
}
PPADDR_t*
Perl_get_ppaddr(pTHX)
{
- return (PPADDR_t*)PL_ppaddr;
+ PERL_UNUSED_CONTEXT;
+ return (PPADDR_t*)PL_ppaddr;
}
#ifndef HAS_GETENV_LEN
@@ -3496,6 +3513,7 @@
Perl_getenv_len(pTHX_ const char *env_elem, unsigned long *len)
{
char * const env_trans = PerlEnv_getenv(env_elem);
+ PERL_UNUSED_CONTEXT;
if (env_trans)
*len = strlen(env_trans);
return env_trans;
@@ -3507,6 +3525,7 @@
Perl_get_vtbl(pTHX_ int vtbl_id)
{
const MGVTBL* result;
+ PERL_UNUSED_CONTEXT;
switch(vtbl_id) {
case want_vtbl_sv:
@@ -3814,6 +3833,7 @@
int secs;
int month, mday, year, jday;
int odd_cent, odd_year;
+ PERL_UNUSED_CONTEXT;
#define DAYS_PER_YEAR 365
#define DAYS_PER_QYEAR (4*DAYS_PER_YEAR+1)
@@ -4529,6 +4549,7 @@
void
Perl_sv_nosharing(pTHX_ SV *sv)
{
+ PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(sv);
}
@@ -4713,6 +4734,7 @@
{
const char * const stashpv = CopSTASHPV(c);
const char * const name = HvNAME_get(hv);
+ PERL_UNUSED_CONTEXT;
if (stashpv == name)
return TRUE;
End of Patch.
