From a9f96b3fd8bd68e3c0062e4f23c142442340b0b5 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Sun, 30 Oct 2005 08:38:07 +0000 Subject: [PATCH] Replace do_aexec() with a macro to call do_aexec5() with the two extra 0 arguments. Move the old body to mathoms.c p4raw-id: //depot/perl@25891 --- doio.c | 8 -------- embed.fnc | 2 +- embed.h | 2 -- mathoms.c | 8 ++++++++ perl.h | 5 ++++- proto.h | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/doio.c b/doio.c index 3a270db..63866ba 100644 --- a/doio.c +++ b/doio.c @@ -1409,14 +1409,6 @@ Perl_my_lstat(pTHX) return PL_laststatval; } -#ifndef OS2 -bool -Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp) -{ - return do_aexec5(really, mark, sp, 0, 0); -} -#endif - bool Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp, int fd, int do_report) diff --git a/embed.fnc b/embed.fnc index 429a213..7c0c47a 100644 --- a/embed.fnc +++ b/embed.fnc @@ -177,7 +177,7 @@ Afp |OP* |die |NULLOK const char* pat|... p |OP* |vdie |NULLOK const char* pat|NULLOK va_list* args p |OP* |die_where |NULLOK const char* message|STRLEN msglen Ap |void |dounwind |I32 cxix -p |bool |do_aexec |NULLOK SV* really|NN SV** mark|NN SV** sp +pmb |bool |do_aexec |NULLOK SV* really|NN SV** mark|NN SV** sp p |bool |do_aexec5 |NULLOK SV* really|NN SV** mark|NN SV** sp|int fd|int flag Ap |int |do_binmode |NN PerlIO *fp|int iotype|int mode p |void |do_chop |NN SV* asv|NN SV* sv diff --git a/embed.h b/embed.h index db63763..517900e 100644 --- a/embed.h +++ b/embed.h @@ -155,7 +155,6 @@ #endif #define dounwind Perl_dounwind #ifdef PERL_CORE -#define do_aexec Perl_do_aexec #define do_aexec5 Perl_do_aexec5 #endif #define do_binmode Perl_do_binmode @@ -2148,7 +2147,6 @@ #endif #define dounwind(a) Perl_dounwind(aTHX_ a) #ifdef PERL_CORE -#define do_aexec(a,b,c) Perl_do_aexec(aTHX_ a,b,c) #define do_aexec5(a,b,c,d,e) Perl_do_aexec5(aTHX_ a,b,c,d,e) #endif #define do_binmode(a,b,c) Perl_do_binmode(aTHX_ a,b,c) diff --git a/mathoms.c b/mathoms.c index 91a1709..8a42e63 100644 --- a/mathoms.c +++ b/mathoms.c @@ -636,6 +636,14 @@ Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode) return PerlIO_binmode(aTHX_ fp, iotype, mode, name); } +#ifndef OS2 +bool +Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp) +{ + return do_aexec5(really, mark, sp, 0, 0); +} +#endif + #ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION bool Perl_do_exec(pTHX_ const char *cmd) diff --git a/perl.h b/perl.h index 7512a7a..7e3b3ee 100644 --- a/perl.h +++ b/perl.h @@ -5397,7 +5397,10 @@ extern void moncontrol(int); #define do_open(g, n, l, a, rm, rp, sf) \ do_openn(g, n, l, a, rm, rp, sf, (SV **) NULL, 0) #ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION -#define do_exec(cmd) do_exec3(cmd,0,0) +#define do_exec(cmd) do_exec3(cmd,0,0) +#endif +#ifndef OS2 +#define do_aexec(really, mark,sp) do_aexec5(really, mark, sp, 0, 0) #endif /* and finally... */ diff --git a/proto.h b/proto.h index 177a8c1..090f5f6 100644 --- a/proto.h +++ b/proto.h @@ -365,9 +365,9 @@ PERL_CALLCONV OP* Perl_die(pTHX_ const char* pat, ...) PERL_CALLCONV OP* Perl_vdie(pTHX_ const char* pat, va_list* args); PERL_CALLCONV OP* Perl_die_where(pTHX_ const char* message, STRLEN msglen); PERL_CALLCONV void Perl_dounwind(pTHX_ I32 cxix); -PERL_CALLCONV bool Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp) +/* PERL_CALLCONV bool Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp) __attribute__nonnull__(pTHX_2) - __attribute__nonnull__(pTHX_3); + __attribute__nonnull__(pTHX_3); */ PERL_CALLCONV bool Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd, int flag) __attribute__nonnull__(pTHX_2) -- 2.7.4