Tidy up function prototypes in the light of suidpatch

p4raw-id: //depot/perl@22572

diff --git a/embed.fnc b/embed.fnc
index 75d9831..ccd0f57 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1042,9 +1042,9 @@ s |void   |init_postdump_symbols|int|char **|char **
 s      |void   |init_predump_symbols
 rs     |void   |my_exit_jump
 s      |void   |nuke_stacks
-s      |void   |open_script    |char *|bool|SV *|int *fd
+s      |void   |open_script    |char *|bool|SV *
 s      |void   |usage          |char *
-s      |void   |validate_suid  |char *|char*|int
+s      |void   |validate_suid  |char *|char*
 #  if defined(IAMSUID)
 s      |int    |fd_on_nosuid_fs|int fd
 #  endif

diff --git a/embed.h b/embed.h
index 039aedf..dd3cc46 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -3915,13 +3915,13 @@
 #define nuke_stacks()          S_nuke_stacks(aTHX)
 #endif
 #ifdef PERL_CORE
-#define open_script(a,b,c,d)   S_open_script(aTHX_ a,b,c,d)
+#define open_script(a,b,c)     S_open_script(aTHX_ a,b,c)
 #endif
 #ifdef PERL_CORE
 #define usage(a)               S_usage(aTHX_ a)
 #endif
 #ifdef PERL_CORE
-#define validate_suid(a,b,c)   S_validate_suid(aTHX_ a,b,c)
+#define validate_suid(a,b)     S_validate_suid(aTHX_ a,b)
 #endif
 #  if defined(IAMSUID)
 #ifdef PERL_CORE

diff --git a/perl.c b/perl.c
index ff5769a..a769190 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -1188,8 +1188,6 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
     register SV *sv;
     register char *s;
     char *cddir = Nullch;
-/* PSz 18 Feb 04  fdscript now global, keep from confusion */
-    int dummy_fdscript = -1;
 
     PL_fdscript = -1;
     PL_suidscript = -1;
@@ -1499,9 +1497,9 @@ print \"  \\@INC:\\n    @INC\\n\";");
 
     init_perllib();
 
-    open_script(scriptname,dosearch,sv,&dummy_fdscript);
+    open_script(scriptname,dosearch,sv);
 
-    validate_suid(validarg, scriptname,dummy_fdscript);
+    validate_suid(validarg, scriptname);
 
 #ifndef PERL_MICRO
 #if defined(SIGCHLD) || defined(SIGCLD)
@@ -2934,7 +2932,7 @@ S_init_main_stash(pTHX)
 
 /* PSz 18 Nov 03  fdscript now global but do not change prototype */
 STATIC void
-S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv, int *dummy_fdscript)
+S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv)
 {
 #ifndef IAMSUID
     char *quote;
@@ -3232,9 +3230,8 @@ S_fd_on_nosuid_fs(pTHX_ int fd)
 }
 #endif /* IAMSUID */
 
-/* PSz 18 Nov 03  fdscript now global but do not change prototype */
 STATIC void
-S_validate_suid(pTHX_ char *validarg, char *scriptname, int dummy_fdscript)
+S_validate_suid(pTHX_ char *validarg, char *scriptname)
 {
 #ifdef IAMSUID
     /* int which; */

diff --git a/proto.h b/proto.h
index 3a5ecdc..8825c09 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -999,9 +999,9 @@ STATIC void S_init_postdump_symbols(pTHX_ int, char **, char **);
 STATIC void    S_init_predump_symbols(pTHX);
 STATIC void    S_my_exit_jump(pTHX) __attribute__((noreturn));
 STATIC void    S_nuke_stacks(pTHX);
-STATIC void    S_open_script(pTHX_ char *, bool, SV *, int *fd);
+STATIC void    S_open_script(pTHX_ char *, bool, SV *);
 STATIC void    S_usage(pTHX_ char *);
-STATIC void    S_validate_suid(pTHX_ char *, char*, int);
+STATIC void    S_validate_suid(pTHX_ char *, char*);
 #  if defined(IAMSUID)
 STATIC int     S_fd_on_nosuid_fs(pTHX_ int fd);
 #  endif