In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/670de6d6a9c900cd23ea5f542b7d35bbd83f1084?hp=709aee9447f22f3f59d548d44298cca98a023f80>
- Log -----------------------------------------------------------------
commit 670de6d6a9c900cd23ea5f542b7d35bbd83f1084
Merge: 709aee9 878ce26
Author: Tony Cook <t...@develop-help.com>
Date: Wed Nov 20 15:11:15 2013 +1100
[perl #120043] fix some warnings
with an update for perldiag
commit 878ce265487fe15b56308f8b48e182f3a1418c9b
Author: Tony Cook <t...@develop-help.com>
Date: Wed Nov 20 15:09:44 2013 +1100
update perldiag for the change in conversion specifiers
M pod/perldiag.pod
-----------------------------------------------------------------------
Summary of changes:
mg.c | 2 +-
perl.c | 4 ++--
pod/perldiag.pod | 2 +-
regexec.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mg.c b/mg.c
index e8d22a3..7c10bd5 100644
--- a/mg.c
+++ b/mg.c
@@ -1969,7 +1969,7 @@ Perl_magic_setdbline(pTHX_ SV *sv, MAGIC *mg)
/* The magic ptr/len for the debugger's hash should always be an SV. */
if (UNLIKELY(mg->mg_len != HEf_SVKEY)) {
Perl_croak(aTHX_ "panic: magic_setdbline len=%"IVdf", ptr='%s'",
- mg->mg_len, mg->mg_ptr);
+ (IV)mg->mg_len, mg->mg_ptr);
}
/* Use sv_2iv instead of SvIV() as the former generates smaller code, and
diff --git a/perl.c b/perl.c
index e4310cd..b551d45 100644
--- a/perl.c
+++ b/perl.c
@@ -4902,7 +4902,7 @@ Perl_my_exit(pTHX_ U32 status)
}
if (PL_exit_flags & PERL_EXIT_WARN) {
PL_exit_flags |= PERL_EXIT_ABORT; /* Protect against reentrant calls */
- Perl_warn(aTHX_ "Unexpected exit %u", status);
+ Perl_warn(aTHX_ "Unexpected exit %lu", (unsigned long)status);
PL_exit_flags &= ~PERL_EXIT_ABORT;
}
switch (status) {
@@ -5007,7 +5007,7 @@ Perl_my_failure_exit(pTHX)
}
if (PL_exit_flags & PERL_EXIT_WARN) {
PL_exit_flags |= PERL_EXIT_ABORT; /* Protect against reentrant calls */
- Perl_warn(aTHX_ "Unexpected exit failure %u", PL_statusvalue);
+ Perl_warn(aTHX_ "Unexpected exit failure %ld", (long)PL_statusvalue);
PL_exit_flags &= ~PERL_EXIT_ABORT;
}
my_exit_jump();
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 773c43b..4061fe2 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -5538,7 +5538,7 @@ internal consistency check. It encountered a malformed
op tree.
(S) exit() was called or the script otherwise finished gracefully when
C<PERL_EXIT_WARN> was set in C<PL_exit_flags>.
-=item Unexpected exit failure %u
+=item Unexpected exit failure %d
(S) An uncaught die() was called when C<PERL_EXIT_WARN> was set in
C<PL_exit_flags>.
diff --git a/regexec.c b/regexec.c
index acca274..6de1783 100644
--- a/regexec.c
+++ b/regexec.c
@@ -2283,7 +2283,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char
*stringarg, char *strend,
: strbeg; /* pos() not defined; use start of string */
DEBUG_GPOS_r(PerlIO_printf(Perl_debug_log,
- "GPOS ganch set to strbeg[%"IVdf"]\n", reginfo->ganch - strbeg));
+ "GPOS ganch set to strbeg[%"IVdf"]\n", (IV)(reginfo->ganch -
strbeg)));
/* in the presence of \G, we may need to start looking earlier in
* the string than the suggested start point of stringarg:
--
Perl5 Master Repository
