diag.t: Remove printf conversion modifiers from msgs

The user doesn't need to know that the message was formatted with, eg., and
'ld' vs just a 'd'

2 files changed, 11 insertions, 10 deletions

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 768a886886..53c5803b0b 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -50,7 +50,7 @@ letter.
 to check the return value of your socket() call?  See
 L<perlfunc/accept>.
 
-=item Allocation too large: %lx
+=item Allocation too large: %x
 
 (X) You can't allocate more than 64K on an MS-DOS machine.
 
@@ -279,7 +279,7 @@ which is not in its key set.
 (F) The failing code attempted to delete a key whose value has been
 declared readonly from a restricted hash.
 
-=item Attempt to free non-arena SV: 0x%lx
+=item Attempt to free non-arena SV: 0x%x
 
 (P internal) All SV objects are supposed to be allocated from arenas
 that will be garbage collected on exit.  An SV was discovered to be
@@ -365,7 +365,7 @@ attribute on an array, hash or scalar reference. The :unique attribute has
 had no effect since Perl 5.8.8, and will be removed in the next major
 release of Perl 5.
 
-=item Bad arg length for %s, is %d, should be %d
+=item Bad arg length for %s, is %u, should be %d
 
 (F) You passed a buffer of the wrong size to one of msgctl(), semctl()
 or shmctl().  In C parlance, the correct sizes are, respectively,
@@ -1464,7 +1464,7 @@ expression compiler gave it.
 (P) The regular expression engine got passed a regexp program without a
 valid magic number.
 
-=item Corrupt malloc ptr 0x%lx at 0x%lx
+=item Corrupt malloc ptr 0x%x at 0x%x
 
 (P) The malloc package that comes with Perl had an internal failure.
 
@@ -2513,7 +2513,7 @@ rules and perl was unable to guess how to make more progress.
 (F) You tried to unpack something that didn't comply with UTF-8 encoding
 rules and perl was unable to guess how to make more progress.
 
-=item Maximal count of pending signals (%d) exceeded
+=item Maximal count of pending signals (%u) exceeded
 
 (F) Perl aborted due to a too high number of signals pending. This
 usually indicates that your operating system tried to deliver signals
@@ -3812,7 +3812,7 @@ before now.  Check your control flow.
 
 (W unopened) You tried to read from a filehandle that was never opened.
 
-=item Reallocation too large: %lx
+=item Reallocation too large: %x
 
 (F) You can't allocate more than 64K on an MS-DOS machine.
 
diff --git a/t/porting/diag.t b/t/porting/diag.t
index 4bc4ed7b9c..c8b2d0ea2d 100644
--- a/t/porting/diag.t
+++ b/t/porting/diag.t
@@ -235,7 +235,9 @@ sub check_file {
                           SVf  => 's');
     my $format_modifiers = qr/ [#0\ +-]*              # optional flags
                               (?: [1-9][0-9]* | \* )? # optional field width
-                              (?: \. \d* )? /x;       # optional precision
+                              (?: \. \d* )?           # optional precision
+                              (?: h|l )?              # optional length modifier
+                            /x;
     for my $from (keys %specialformats) {
       s/%$format_modifiers"\s*$from\s*"/\%$specialformats{$from}/g;
       s/%$format_modifiers"\s*$from/\%$specialformats{$from}"/g;
@@ -344,7 +346,6 @@ Malformed UTF-8 character (unexpected non-continuation byte 0x%x, immediately af
 Argument "%s" isn't numeric
 Argument "%s" isn't numeric in %s
 Attempt to clear deleted array
-Attempt to free non-arena SV: 0x%x
 Attempt to free non-existent shared string '%s'%s
 Attempt to free temp prematurely: SV 0x%x
 Attempt to free unreferenced scalar: SV 0x%x
@@ -441,8 +442,8 @@ Malformed UTF-8 character (fatal)
 Missing (suid) fd script name
 More than one argument to open
 More than one argument to open(,':%s')
-mprotect for %p %d failed with %d
-mprotect RW for %p %d failed with %d
+mprotect for %p %u failed with %d
+mprotect RW for %p %u failed with %d
 No code specified for -%c
 No directory specified for -I
 No such class field "%s"