Remove C variables (and a parameter!) now unused since -P bit the dust.

p4raw-id: //depot/perl@32958

diff --git a/embed.fnc b/embed.fnc
index 9eff399..0e12772 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1275,7 +1275,7 @@ s |void   |init_predump_symbols
 rs     |void   |my_exit_jump
 s      |void   |nuke_stacks
 s      |int    |open_script    |NN const char *scriptname|bool dosearch \
-                               |NN SV *sv|NN int *suidscript|NN PerlIO **rsfpp
+                               |NN int *suidscript|NN PerlIO **rsfpp
 s      |void   |usage          |NN const char *name
 s      |void   |validate_suid  |NN const char *validarg \
                                |NN const char *scriptname|int fdscript \

diff --git a/embed.h b/embed.h
index 3101da9..b18b5b6 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -3550,7 +3550,7 @@
 #define init_predump_symbols() S_init_predump_symbols(aTHX)
 #define my_exit_jump()         S_my_exit_jump(aTHX)
 #define nuke_stacks()          S_nuke_stacks(aTHX)
-#define open_script(a,b,c,d,e) S_open_script(aTHX_ a,b,c,d,e)
+#define open_script(a,b,c,d)   S_open_script(aTHX_ a,b,c,d)
 #define usage(a)               S_usage(aTHX_ a)
 #define validate_suid(a,b,c,d,e,f)     S_validate_suid(aTHX_ a,b,c,d,e,f)
 #endif

diff --git a/perl.c b/perl.c
index 67c99eb..4397087 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -2030,7 +2030,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
     {
        int suidscript;
        const int fdscript
-           = open_script(scriptname, dosearch, sv, &suidscript, &rsfp);
+           = open_script(scriptname, dosearch, &suidscript, &rsfp);
 
        validate_suid(validarg, scriptname, fdscript, suidscript,
                linestr_sv, rsfp);
@@ -3488,15 +3488,9 @@ S_init_main_stash(pTHX)
 }
 
 STATIC int
-S_open_script(pTHX_ const char *scriptname, bool dosearch, SV *sv,
+S_open_script(pTHX_ const char *scriptname, bool dosearch,
              int *suidscript, PerlIO **rsfpp)
 {
-#ifndef IAMSUID
-    const char *quote;
-    const char *code;
-    const char *cpp_discard_flag;
-    const char *perl;
-#endif
     int fdscript = -1;
     dVAR;
 

diff --git a/proto.h b/proto.h
index 1841859..e290d79 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -3402,11 +3402,10 @@ STATIC void     S_my_exit_jump(pTHX)
                        __attribute__noreturn__;
 
 STATIC void    S_nuke_stacks(pTHX);
-STATIC int     S_open_script(pTHX_ const char *scriptname, bool dosearch, SV *sv, int *suidscript, PerlIO **rsfpp)
+STATIC int     S_open_script(pTHX_ const char *scriptname, bool dosearch, int *suidscript, PerlIO **rsfpp)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_3)
-                       __attribute__nonnull__(pTHX_4)
-                       __attribute__nonnull__(pTHX_5);
+                       __attribute__nonnull__(pTHX_4);
 
 STATIC void    S_usage(pTHX_ const char *name)
                        __attribute__nonnull__(pTHX_1);