In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/ddb2f04f1f936382c5b771ae6e4e81083104ee7e?hp=8e79611597d95802d03ffff2bdfe4ca5ab24ea62>
- Log ----------------------------------------------------------------- commit ddb2f04f1f936382c5b771ae6e4e81083104ee7e Author: David Mitchell <[email protected]> Date: Wed Nov 29 08:24:21 2017 +0000 POSIX.xs: remove unused variable commit e3929c01a7e43a0710758c66cf3ce4d32715b8d5 Author: David Mitchell <[email protected]> Date: Wed Nov 29 08:16:26 2017 +0000 rpeep(): use OPpPADHV_ISKEYS, not OPpRV2HV_ISKEYS I added a bit of code with 748f2c65599 that looked like: o->op_private |= (o->op_type == OP_PADHV ? OPpRV2HV_ISKEYS : OPpRV2HV_ISKEYS); That first constant should of course been OPpPADHV_ISKEYS - although since both constants currently have the same value, it didn't make any difference at the time. Spotted by Coverity, and brought to my attention by jhi++. ----------------------------------------------------------------------- Summary of changes: ext/POSIX/POSIX.xs | 1 - op.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 922f4d15c8..49d36a3fc0 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -3565,7 +3565,6 @@ strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1) GCC_DIAG_RESTORE; sv = sv_newmortal(); if (buf) { - const U8 * first_variant; STRLEN len = strlen(buf); sv_usepvn_flags(sv, buf, len, SV_HAS_TRAILING_NUL); if ( SvUTF8(fmt) diff --git a/op.c b/op.c index 8e6940988b..7e7727a674 100644 --- a/op.c +++ b/op.c @@ -15550,7 +15550,7 @@ Perl_rpeep(pTHX_ OP *o) o->op_flags &= ~(OPf_REF|OPf_WANT); o->op_flags |= want; o->op_private |= (o->op_type == OP_PADHV ? - OPpRV2HV_ISKEYS : OPpRV2HV_ISKEYS); + OPpPADHV_ISKEYS : OPpRV2HV_ISKEYS); /* for keys(%lex), hold onto the OP_KEYS's targ * since padhv doesn't have its own targ to return * an int with */ -- Perl5 Master Repository
