From b24bc0958ea575493f4672819334c2b884f1e90d Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Sat, 25 Feb 2012 23:50:49 +0100 Subject: [PATCH] Remove all the never used parameters from the macro validate_suid() Several parameters are unused in either remaining variant of the validate_suid() macro. The two variants which used the extra parameters were removed with suidperl by commit cc69b689ee7c2745 in Jan 2009. --- perl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/perl.c b/perl.c index 104cac7..e060948 100644 --- a/perl.c +++ b/perl.c @@ -77,11 +77,9 @@ char *getenv (char *); /* Usually in */ static I32 read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen); #ifdef SETUID_SCRIPTS_ARE_SECURE_NOW -/* Drop everything. Heck, don't even try to call it */ -# define validate_suid(validarg, scriptname, fdscript, suidscript, linestr_sv, rsfp) NOOP +# define validate_suid(rsfp) NOOP #else -/* Drop almost everything */ -# define validate_suid(validarg, scriptname, fdscript, suidscript, linestr_sv, rsfp) S_validate_suid(aTHX_ rsfp) +# define validate_suid(rsfp) S_validate_suid(aTHX_ rsfp) #endif #define CALL_BODY_SUB(myop) \ @@ -2080,8 +2078,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) lex_start_flags = LEX_DONT_CLOSE_RSFP; } - validate_suid(validarg, scriptname, fdscript, suidscript, - linestr_sv, rsfp); + validate_suid(rsfp); #ifndef PERL_MICRO # if defined(SIGCHLD) || defined(SIGCLD) -- 1.8.3.1