Change 32958 by [EMAIL PROTECTED] on 2008/01/11 16:42:11

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

Affected files ...

... //depot/perl/embed.fnc#558 edit
... //depot/perl/embed.h#742 edit
... //depot/perl/perl.c#846 edit
... //depot/perl/proto.h#892 edit

Differences ...

==== //depot/perl/embed.fnc#558 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#557~32948~   2008-01-11 02:42:13.000000000 -0800
+++ perl/embed.fnc      2008-01-11 08:42:11.000000000 -0800
@@ -1275,7 +1275,7 @@
 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 \

==== //depot/perl/embed.h#742 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#741~32948~     2008-01-11 02:42:13.000000000 -0800
+++ perl/embed.h        2008-01-11 08:42:11.000000000 -0800
@@ -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

==== //depot/perl/perl.c#846 (text) ====
Index: perl/perl.c
--- perl/perl.c#845~32954~      2008-01-11 05:55:07.000000000 -0800
+++ perl/perl.c 2008-01-11 08:42:11.000000000 -0800
@@ -2030,7 +2030,7 @@
     {
        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 @@
 }
 
 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;
 

==== //depot/perl/proto.h#892 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#891~32948~     2008-01-11 02:42:13.000000000 -0800
+++ perl/proto.h        2008-01-11 08:42:11.000000000 -0800
@@ -3402,11 +3402,10 @@
                        __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);
End of Patch.

Reply via email to