From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 12 Oct 2009 14:54:30 +0000 (+0100)
Subject: Normalise 3 fatal pack/unpack error messages to "panic: %s"
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5f5991a0d6d8ef99d2643b88a7d9285e35277331;p=p5sagit%2Fp5-mst-13.2.git

Normalise 3 fatal pack/unpack error messages to "panic: %s"
---

diff --git a/pp_pack.c b/pp_pack.c
index 5933fd5..ef25109 100644
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -2426,7 +2426,7 @@ marked_upgrade(pTHX_ SV *sv, tempsym_t *sym_ptr) {
     if (m != marks + sym_ptr->level+1) {
 	Safefree(marks);
 	Safefree(to_start);
-	Perl_croak(aTHX_ "Assertion: marks beyond string end");
+	Perl_croak(aTHX_ "panic: marks beyond string end");
     }
     for (group=sym_ptr; group; group = group->previous)
 	group->strbeg = marks[group->level] - to_start;
@@ -2760,7 +2760,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
 		GROWING(0, cat, start, cur, len);
 		if (!uni_to_bytes(aTHX_ &aptr, end, cur, fromlen,
 				  datumtype | TYPE_IS_PACK))
-		    Perl_croak(aTHX_ "Perl bug: predicted utf8 length not available");
+		    Perl_croak(aTHX_ "panic: predicted utf8 length not available");
 		cur += fromlen;
 		len -= fromlen;
 	    } else if (utf8) {
@@ -3549,7 +3549,7 @@ extern const double _double_constants[];
 				      'u' | TYPE_IS_PACK)) {
 			*cur = '\0';
 			SvCUR_set(cat, cur - start);
-			Perl_croak(aTHX_ "Assertion: string is shorter than advertised");
+			Perl_croak(aTHX_ "panic: string is shorter than advertised");
 		    }
 		    end = doencodes(hunk, buffer, todo);
 		} else {
diff --git a/t/porting/diag.t b/t/porting/diag.t
index 8b7edb6..9aa25d5 100644
--- a/t/porting/diag.t
+++ b/t/porting/diag.t
@@ -186,8 +186,6 @@ Ambiguous use of %c{%s%s} resolved to %c%s%s
 Ambiguous use of -%s resolved as -&%s()
 Argument "%s" isn't numeric
 Argument "%s" isn't numeric in %s
-Assertion: marks beyond string end
-Assertion: string is shorter than advertised
 Attempt to clear deleted array
 Attempt to free non-arena SV: 0x%x
 Attempt to free non-existent shared string '%s'%s
@@ -301,7 +299,6 @@ Opening dirhandle %s also as a file
 Opening filehandle %s also as a directory
 Operator or semicolon missing before %c%s
 Overloaded dereference did not return a reference
-Perl bug: predicted utf8 length not available
 PERL_SIGNALS illegal: "%s"
 Perl %s required (did you mean %s?)--this is only %s, stopped
 Perl %s required--this is only %s, stopped