summaryrefslogtreecommitdiff
path: root/perl.c
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2012-02-25 23:50:49 +0100
committerNicholas Clark <nick@ccl4.org>2012-03-17 11:44:36 +0100
commitb24bc0958ea575493f4672819334c2b884f1e90d (patch)
treeb09349006ba66d797ec5e06bf624dcdf6e9a3c13 /perl.c
parent17d155413b0e201ca149c3701d53539001559d4d (diff)
downloadperl-b24bc0958ea575493f4672819334c2b884f1e90d.tar.gz
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.
Diffstat (limited to 'perl.c')
-rw-r--r--perl.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/perl.c b/perl.c
index 104cac7c8a..e060948b7f 100644
--- a/perl.c
+++ b/perl.c
@@ -77,11 +77,9 @@ char *getenv (char *); /* Usually in <stdlib.h> */
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)