From: Andy Lester Date: Wed, 9 May 2007 11:49:13 +0000 (-0500) Subject: Remove unused parms in S_isa_lookup X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=810e611394e65af2f8be3aaa197ca7d2ca61e563;p=p5sagit%2Fp5-mst-13.2.git Remove unused parms in S_isa_lookup Message-Id: <1CBA316A-EC1D-4E8F-8DEE-35322F390358@petdance.com> p4raw-id: //depot/perl@31185 --- diff --git a/embed.fnc b/embed.fnc index addde2c..fcb5b56 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1550,7 +1550,7 @@ s |void |printbuf |NN const char* fmt|NN const char* s #endif #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT) -s |bool|isa_lookup |NULLOK HV *stash|NN const char *name|NULLOK const HV * const name_stash|int len|int level +s |bool|isa_lookup |NULLOK HV *stash|NN const char * const name|NULLOK const HV * const name_stash #endif #if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT) diff --git a/embed.h b/embed.h index b3e2338..c076e84 100644 --- a/embed.h +++ b/embed.h @@ -3831,7 +3831,7 @@ #endif #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define isa_lookup(a,b,c,d,e) S_isa_lookup(aTHX_ a,b,c,d,e) +#define isa_lookup(a,b,c) S_isa_lookup(aTHX_ a,b,c) #endif #endif #if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT) diff --git a/proto.h b/proto.h index e731d5f..a27ad79 100644 --- a/proto.h +++ b/proto.h @@ -4135,7 +4135,7 @@ STATIC void S_printbuf(pTHX_ const char* fmt, const char* s) #endif #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT) -STATIC bool S_isa_lookup(pTHX_ HV *stash, const char *name, const HV * const name_stash, int len, int level) +STATIC bool S_isa_lookup(pTHX_ HV *stash, const char * const name, const HV * const name_stash) __attribute__nonnull__(pTHX_2); #endif diff --git a/universal.c b/universal.c index ef73504..396dd3d 100644 --- a/universal.c +++ b/universal.c @@ -32,16 +32,13 @@ */ STATIC bool -S_isa_lookup(pTHX_ HV *stash, const char *name, const HV* const name_stash, - int len, int level) +S_isa_lookup(pTHX_ HV *stash, const char * const name, const HV* const name_stash) { dVAR; AV* stash_linear_isa; SV** svp; const char *hvname; I32 items; - PERL_UNUSED_ARG(len); - PERL_UNUSED_ARG(level); /* A stash/class can go by many names (ie. User == main::User), so we compare the stash itself just in case */ @@ -61,7 +58,7 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, const HV* const name_stash, items = AvFILLp(stash_linear_isa); while (items--) { SV* const basename_sv = *svp++; - HV* basestash = gv_stashsv(basename_sv, 0); + HV* const basestash = gv_stashsv(basename_sv, 0); if (!basestash) { if (ckWARN(WARN_SYNTAX)) Perl_warner(aTHX_ packWARN(WARN_SYNTAX), @@ -110,7 +107,7 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name) if (stash) { HV * const name_stash = gv_stashpv(name, 0); - return isa_lookup(stash, name, name_stash, strlen(name), 0); + return isa_lookup(stash, name, name_stash); } else return FALSE;