S_doparseform() should return void, not OP*, as it should use Perl_die not DIE

a1b950687051c32e added an error condition in S_doparseform() but used DIE(...)
to report it. DIE is defined as C<return Perl_die>, which acts as a hint to the
compiler about the control flow [as Perl_die() never returns], but also forces
the return type to be OP *. Whilst this is appropriate for pp functions, it's
not for S_doparseform() - a1b950687051c32e had to change the return type to OP*
and return NULL, just to appease DIE(). Hence use Perl_die() instead, remove
return statements, and remove the didn't-return-NULL (dead) code from
pp_formline.

1 files changed, 4 insertions, 8 deletions

diff --git a/pp_ctl.c b/pp_ctl.c
index 1b0b5f706b..4fb3b40ee8 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -547,19 +547,16 @@ PP(pp_formline)
     bool item_is_utf8 = FALSE;
     bool targ_is_utf8 = FALSE;
     SV * nsv = NULL;
-    OP * parseres = NULL;
     const char *fmt;
 
     if (!SvMAGICAL(tmpForm) || !SvCOMPILED(tmpForm)) {
 	if (SvREADONLY(tmpForm)) {
 	    SvREADONLY_off(tmpForm);
-	    parseres = doparseform(tmpForm);
+	    doparseform(tmpForm);
 	    SvREADONLY_on(tmpForm);
 	}
 	else
-	    parseres = doparseform(tmpForm);
-	if (parseres)
-	    return parseres;
+	    doparseform(tmpForm);
     }
     SvPV_force(PL_formtarget, len);
     if (SvTAINTED(tmpForm))
@@ -4917,7 +4914,7 @@ PP(pp_break)
 	RETURNOP(cx->blk_givwhen.leave_op);
 }
 
-STATIC OP *
+static void
 S_doparseform(pTHX_ SV *sv)
 {
     STRLEN len;
@@ -5132,8 +5129,7 @@ S_doparseform(pTHX_ SV *sv)
     SvCOMPILED_on(sv);
 
     if (unchopnum && repeat)
-        DIE(aTHX_ "Repeated format line will never terminate (~~ and @#)");
-    return 0;
+        Perl_die(aTHX_ "Repeated format line will never terminate (~~ and @#)");
 }