From: Robin Barker <RMBarker@cpan.org>
Date: Thu, 28 Jul 2005 14:05:51 +0000 (+0100)
Subject: tidy up DieNull and DIE_NULL
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c3bdd8263d4f5196a25a1ba83d5d0e32a6ac2744;p=p5sagit%2Fp5-mst-13.2.git

tidy up DieNull and DIE_NULL
Message-ID: <533D273D4014D411AB1D00062938C4D90849C75C@hotel.npl.co.uk>

p4raw-id: //depot/perl@25237
---

diff --git a/embed.fnc b/embed.fnc
index bbafdbe..f209bb3 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -171,7 +171,7 @@ Ap	|char*	|delimcpy	|NN char* to|NN const char* toend|NN const char* from \
 				|NN const char* fromend|int delim|NN I32* retlen
 p	|void	|deprecate	|NN const char* s
 p	|void	|deprecate_old	|NN const char* s
-Afp	|OP*	|die		|NN const char* pat|...
+Afp	|OP*	|die		|NULLOK const char* pat|...
 p	|OP*	|vdie		|NULLOK const char* pat|NULLOK va_list* args
 p	|OP*	|die_where	|NN const char* message|STRLEN msglen
 Ap	|void	|dounwind	|I32 cxix
diff --git a/mg.c b/mg.c
index 3c691ea..65d565d 100644
--- a/mg.c
+++ b/mg.c
@@ -2749,7 +2749,7 @@ Perl_sighandler(int sig)
 	(void)rsignal(sig, PL_csighandlerp);
 #endif
 #endif /* !PERL_MICRO */
-	DieNull;
+	Perl_die(aTHX_ Nullch);
     }
 cleanup:
     if (flags & 1)
diff --git a/perl.h b/perl.h
index 73979b6..8d5ac67 100644
--- a/perl.h
+++ b/perl.h
@@ -2727,10 +2727,6 @@ typedef pthread_key_t	perl_key;
 #  define UVf UVuf
 #endif
 
-#ifndef DieNull
-#  define DieNull Perl_vdie(aTHX_ Nullch, Null(va_list *))
-#endif
-
 #ifdef HASATTRIBUTE_FORMAT
 #  define __attribute__format__(x,y,z)      __attribute__((format(x,y,z)))
 #endif
diff --git a/pp.h b/pp.h
index d5e3bf9..1f426e7 100644
--- a/pp.h
+++ b/pp.h
@@ -87,7 +87,6 @@ Refetch the stack pointer.  Used after a callback.  See L<perlcall>.
 
 #define NORMAL PL_op->op_next
 #define DIE return Perl_die
-#define DIE_NULL return DieNull
 
 /*
 =for apidoc Ams||PUTBACK
diff --git a/pp_sys.c b/pp_sys.c
index 4ca140f..0e80ec5 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -511,7 +511,7 @@ PP(pp_die)
 		    sv_setsv(error,*PL_stack_sp--);
 		}
 	    }
-	    DIE_NULL;
+	    DIE(aTHX_ Nullch);
 	}
 	else {
 	    if (SvPOK(error) && SvCUR(error))
diff --git a/proto.h b/proto.h
index 522ee03..ae9778a 100644
--- a/proto.h
+++ b/proto.h
@@ -329,8 +329,7 @@ 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)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__format__(__printf__,pTHX_1,pTHX_2);
 
 PERL_CALLCONV OP*	Perl_vdie(pTHX_ const char* pat, va_list* args);
 PERL_CALLCONV OP*	Perl_die_where(pTHX_ const char* message, STRLEN msglen)