Merge the bulk of Perl_magic_clearsig() into Perl_magic_setsig().

The comment at the top of Perl_magic_clearsig() said:
    XXX Some of this code was copied from Perl_magic_setsig. A little
    refactoring might be in order.
and it was not wrong.

Perl_magic_clearsig() is almost equivalent to Perl_magic_setsig() with the new
signal handler as "DEFAULT". Externally, the sv parameter to Perl_magic_setsig()
was Not NULL, so use a NULL sv to signal that the code is being called as
Perl_magic_clearsig(), for the places where the behaviour of the two diverges.

1 files changed, 1 insertions, 2 deletions

diff --git a/proto.h b/proto.h
index 3f95eb5d71..b34e9a8929 100644
--- a/proto.h
+++ b/proto.h
@@ -1731,10 +1731,9 @@ PERL_CALLCONV int	Perl_magic_setregexp(pTHX_ SV* sv, MAGIC* mg)
 	assert(sv); assert(mg)
 
 PERL_CALLCONV int	Perl_magic_setsig(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 #define PERL_ARGS_ASSERT_MAGIC_SETSIG	\
-	assert(sv); assert(mg)
+	assert(mg)
 
 PERL_CALLCONV int	Perl_magic_setsubstr(pTHX_ SV* sv, MAGIC* mg)
 			__attribute__nonnull__(pTHX_1)