Perl_die() / Perl_croak()

From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
Message-ID: <455186EC.8010906@p6m7g8.com>

(backported to embed.fnc)

p4raw-id: //depot/perl@29229

diff --git a/embed.fnc b/embed.fnc
index a3251a0..5b254b5 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -131,7 +131,7 @@ ApR |I32    |my_chsize      |int fd|Off_t length
 pR     |OP*    |convert        |I32 optype|I32 flags|NULLOK OP* o
 pM     |PERL_CONTEXT*  |create_eval_scope|U32 flags
 : croak()'s first parm can be NULL.  Otherwise, mod_perl breaks.
-Afprd  |void   |croak          |NULLOK const char* pat|...
+Aprd   |void   |croak          |NULLOK const char* pat|...
 Apr    |void   |vcroak         |NN const char* pat|NULLOK va_list* args
 #if defined(PERL_IMPLICIT_CONTEXT)
 Afnrp  |void   |croak_nocontext|NN const char* pat|...
@@ -180,7 +180,7 @@ Ap  |char*  |delimcpy       |NN char* to|NN const char* toend|NN const char* from \
 pM     |void   |delete_eval_scope
 p      |void   |deprecate      |NN const char* s
 p      |void   |deprecate_old  |NN const char* s
-Afp    |OP*    |die            |NULLOK const char* pat|...
+Ap     |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

diff --git a/proto.h b/proto.h
index 531d583..ce25ca0 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -226,8 +226,7 @@ PERL_CALLCONV OP*   Perl_convert(pTHX_ I32 optype, I32 flags, OP* o)
 
 PERL_CALLCONV PERL_CONTEXT*    Perl_create_eval_scope(pTHX_ U32 flags);
 PERL_CALLCONV void     Perl_croak(pTHX_ const char* pat, ...)
-                       __attribute__noreturn__
-                       __attribute__format__(__printf__,pTHX_1,pTHX_2);
+                       __attribute__noreturn__;
 
 PERL_CALLCONV void     Perl_vcroak(pTHX_ const char* pat, va_list* args)
                        __attribute__noreturn__
@@ -384,9 +383,7 @@ PERL_CALLCONV void  Perl_deprecate(pTHX_ const char* s)
 PERL_CALLCONV void     Perl_deprecate_old(pTHX_ const char* s)
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV OP*      Perl_die(pTHX_ const char* pat, ...)
-                       __attribute__format__(__printf__,pTHX_1,pTHX_2);
-
+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);