In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/147e38468b8279e26a0ca11e4efd8492016f2702?hp=51d89e3583b4182c42c21b343376f2286f67fc3b>
- Log ----------------------------------------------------------------- commit 147e38468b8279e26a0ca11e4efd8492016f2702 Author: Karl Williamson <[email protected]> Date: Thu Nov 17 06:21:54 2016 -0700 Change white space to avoid C++ deprecation warning C++11 requires space between the end of a string literal and a macro, so that a feature can unambiguously be added to the language. Starting in g++ 6.2, the compiler emits a warning when there isn't a space (presumably so that future versions can support C++11). Unfortunately there are many such instances in the perl core. This commit fixes those, including those in ext/, but individual commits will be used for the other modules, those in dist/ and cpan/. This commit also inserts space at the end of a macro before a string literal, even though that is not deprecated, and removes useless "" literals following a macro (instead of inserting a blank). The result is easier to read, making the macro stand out, and be clearer as to the intention. Code and modules included with the Perl core need to be compilable using C++. This is so that perl can be embedded in C++ programs. (Actually, only the hdr files need to be so compilable, but it would be hard to test that just the hdrs are compilable.) So we need to accommodate changes to the C++ language. ----------------------------------------------------------------------- Summary of changes: av.c | 2 +- deb.c | 8 +- doio.c | 39 ++--- dump.c | 311 ++++++++++++++++++++++------------------ ext/B/B.pm | 2 +- ext/B/B.xs | 6 +- ext/Devel-Peek/Peek.xs | 2 +- ext/DynaLoader/DynaLoader_pm.PL | 2 +- ext/DynaLoader/dl_dlopen.xs | 2 +- ext/Hash-Util/Util.xs | 3 +- ext/Hash-Util/lib/Hash/Util.pm | 2 +- ext/POSIX/POSIX.xs | 12 +- ext/XS-APItest/APItest.xs | 17 +-- ext/XS-APItest/core_or_not.inc | 2 +- ext/XS-Typemap/Typemap.pm | 2 +- ext/XS-Typemap/Typemap.xs | 3 +- ext/mro/mro.pm | 2 +- ext/mro/mro.xs | 20 +-- gv.c | 48 +++---- hv.c | 30 ++-- inline.h | 4 +- locale.c | 4 +- malloc.c | 38 +++-- mg.c | 6 +- mro_core.c | 8 +- op.c | 78 +++++----- pad.c | 58 ++++---- perl.c | 16 +-- perl.h | 6 +- perlio.c | 4 +- perly.c | 6 +- pp.c | 10 +- pp.h | 4 +- pp_ctl.c | 34 ++--- pp_hot.c | 28 ++-- pp_pack.c | 9 +- pp_sort.c | 2 +- pp_sys.c | 54 +++---- regcomp.c | 233 +++++++++++++++--------------- regexec.c | 109 +++++++------- scope.c | 50 +++---- sv.c | 96 ++++++------- taint.c | 4 +- toke.c | 77 +++++----- universal.c | 10 +- utf8.c | 64 ++++----- util.c | 56 ++++---- 47 files changed, 816 insertions(+), 767 deletions(-) diff --git a/av.c b/av.c index 0fe2024..5afae8d 100644 --- a/av.c +++ b/av.c @@ -89,7 +89,7 @@ Perl_av_extend_guts(pTHX_ AV *av, SSize_t key, SSize_t *maxp, SV ***allocp, if (key < -1) /* -1 is legal */ Perl_croak(aTHX_ - "panic: av_extend_guts() negative count (%"IVdf")", (IV)key); + "panic: av_extend_guts() negative count (%" IVdf ")", (IV)key); if (key > *maxp) { SV** ary; diff --git a/deb.c b/deb.c index e5b0384..bd6e538 100644 --- a/deb.c +++ b/deb.c @@ -83,12 +83,12 @@ Perl_debstackptrs(pTHX) { #ifdef DEBUGGING PerlIO_printf(Perl_debug_log, - "%8"UVxf" %8"UVxf" %8"IVdf" %8"IVdf" %8"IVdf"\n", + "%8" UVxf " %8" UVxf " %8" IVdf " %8" IVdf " %8" IVdf "\n", PTR2UV(PL_curstack), PTR2UV(PL_stack_base), (IV)*PL_markstack_ptr, (IV)(PL_stack_sp-PL_stack_base), (IV)(PL_stack_max-PL_stack_base)); PerlIO_printf(Perl_debug_log, - "%8"UVxf" %8"UVxf" %8"UVuf" %8"UVuf" %8"UVuf"\n", + "%8" UVxf " %8" UVxf " %8" UVuf " %8" UVuf " %8" UVuf "\n", PTR2UV(PL_mainstack), PTR2UV(AvARRAY(PL_curstack)), PTR2UV(PL_mainstack), PTR2UV(AvFILLp(PL_curstack)), PTR2UV(AvMAX(PL_curstack))); @@ -219,14 +219,14 @@ Perl_deb_stack_all(pTHX) si_name_ix < C_ARRAY_LENGTH(si_names) ? si_names[si_name_ix] : "????"; I32 ix; - PerlIO_printf(Perl_debug_log, "STACK %"IVdf": %s\n", + PerlIO_printf(Perl_debug_log, "STACK %" IVdf ": %s\n", (IV)si_ix, si_name); for (ix=0; ix<=si->si_cxix; ix++) { const PERL_CONTEXT * const cx = &(si->si_cxstack[ix]); PerlIO_printf(Perl_debug_log, - " CX %"IVdf": %-6s => ", + " CX %" IVdf ": %-6s => ", (IV)ix, PL_block_type[CxTYPE(cx)] ); /* substitution contexts don't save stack pointers etc) */ diff --git a/doio.c b/doio.c index a11b64d..67966b5 100644 --- a/doio.c +++ b/doio.c @@ -110,7 +110,8 @@ S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp, if (result == EOF && old_fd > PL_maxsysfd) { /* Why is this not Perl_warn*() call ? */ PerlIO_printf(Perl_error_log, - "Warning: unable to close filehandle %"HEKf" properly.\n", + "Warning: unable to close filehandle %" HEKf + " properly.\n", HEKfARG(GvENAME_HEK(gv)) ); } @@ -636,14 +637,14 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname, if ((IoTYPE(io) == IoTYPE_RDONLY) && (fp == PerlIO_stdout() || fp == PerlIO_stderr())) { Perl_warner(aTHX_ packWARN(WARN_IO), - "Filehandle STD%s reopened as %"HEKf + "Filehandle STD%s reopened as %" HEKf " only for input", ((fp == PerlIO_stdout()) ? "OUT" : "ERR"), HEKfARG(GvENAME_HEK(gv))); } else if ((IoTYPE(io) == IoTYPE_WRONLY) && fp == PerlIO_stdin()) { Perl_warner(aTHX_ packWARN(WARN_IO), - "Filehandle STDIN reopened as %"HEKf" only for output", + "Filehandle STDIN reopened as %" HEKf " only for output", HEKfARG(GvENAME_HEK(gv)) ); } @@ -859,8 +860,8 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen) { IO * const io = GvIOp(PL_argvoutgv); if (io && IoIFP(io) && old_out_name && !io_close(io, PL_argvoutgv, FALSE, FALSE)) { - Perl_croak(aTHX_ "Failed to close in-place edit file %"SVf": %s\n", - old_out_name, Strerror(errno)); + Perl_croak(aTHX_ "Failed to close in-place edit file %" + SVf ": %s\n", old_out_name, Strerror(errno)); } } /* This very long block ends with return IoIFP(GvIOp(gv)); @@ -921,7 +922,8 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen) ) { Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), - "Can't do inplace edit: %"SVf" would not be unique", + "Can't do inplace edit: %" + SVf " would not be unique", SVfARG(sv)); do_close(gv,FALSE); continue; @@ -931,8 +933,10 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen) #if !defined(DOSISH) && !defined(__CYGWIN__) if (PerlLIO_rename(PL_oldname,SvPVX_const(sv)) < 0) { Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), - "Can't rename %s to %"SVf": %s, skipping file", - PL_oldname, SVfARG(sv), Strerror(errno)); + "Can't rename %s to %" SVf + ": %s, skipping file", + PL_oldname, SVfARG(sv), + Strerror(errno)); do_close(gv,FALSE); continue; } @@ -946,7 +950,7 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen) (void)UNLINK(SvPVX_const(sv)); if (link(PL_oldname,SvPVX_const(sv)) < 0) { Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), - "Can't rename %s to %"SVf": %s, skipping file", + "Can't rename %s to %" SVf ": %s, skipping file", PL_oldname, SVfARG(sv), Strerror(errno) ); do_close(gv,FALSE); continue; @@ -1029,7 +1033,7 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen) if (old_out_name) { IO * const io = GvIOp(PL_argvoutgv); if (io && IoIFP(io) && !io_close(io, PL_argvoutgv, FALSE, FALSE)) { - Perl_croak(aTHX_ "Failed to close in-place edit file %"SVf": %s\n", + Perl_croak(aTHX_ "Failed to close in-place edit file %" SVf ": %s\n", old_out_name, Strerror(errno)); } } @@ -1127,13 +1131,13 @@ Perl_io_close(pTHX_ IO *io, GV *gv, bool not_implicit, bool warn_on_fail) if (gv) Perl_ck_warner_d(aTHX_ packWARN(WARN_IO), "Warning: unable to close filehandle %" - HEKf" properly: %"SVf, + HEKf " properly: %" SVf, HEKfARG(GvNAME_HEK(gv)), SVfARG(get_sv("!",GV_ADD))); else Perl_ck_warner_d(aTHX_ packWARN(WARN_IO), "Warning: unable to close filehandle " - "properly: %"SVf, + "properly: %" SVf, SVfARG(get_sv("!",GV_ADD))); } } @@ -1359,9 +1363,9 @@ Perl_do_print(pTHX_ SV *sv, PerlIO *fp) if (SvTYPE(sv) == SVt_IV && SvIOK(sv)) { assert(!SvGMAGICAL(sv)); if (SvIsUV(sv)) - PerlIO_printf(fp, "%"UVuf, (UV)SvUVX(sv)); + PerlIO_printf(fp, "%" UVuf, (UV)SvUVX(sv)); else - PerlIO_printf(fp, "%"IVdf, (IV)SvIVX(sv)); + PerlIO_printf(fp, "%" IVdf, (IV)SvIVX(sv)); return !PerlIO_error(fp); } else { @@ -1503,7 +1507,7 @@ Perl_my_lstat_flags(pTHX_ const U32 flags) if (ckWARN(WARN_IO)) { /* diag_listed_as: Use of -l on filehandle%s */ Perl_warner(aTHX_ packWARN(WARN_IO), - "Use of -l on filehandle %"HEKf, + "Use of -l on filehandle %" HEKf, HEKfARG(GvENAME_HEK(cGVOP_gv))); } return -1; @@ -1530,7 +1534,7 @@ Perl_my_lstat_flags(pTHX_ const U32 flags) else /* diag_listed_as: Use of -l on filehandle%s */ Perl_warner(aTHX_ packWARN(WARN_IO), - "Use of -l on filehandle %"HEKf, + "Use of -l on filehandle %" HEKf, HEKfARG(GvENAME_HEK((const GV *) (SvROK(sv) ? SvRV(sv) : sv)))); } @@ -1894,7 +1898,8 @@ nothing in the core. len -= 3; } if ((val = whichsig_pvn(s, len)) < 0) - Perl_croak(aTHX_ "Unrecognized signal name \"%"SVf"\"", SVfARG(*mark)); + Perl_croak(aTHX_ "Unrecognized signal name \"%" SVf "\"", + SVfARG(*mark)); } else { diff --git a/dump.c b/dump.c index 0d3dce5..3915af1 100644 --- a/dump.c +++ b/dump.c @@ -172,12 +172,12 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, { if (flags & PERL_PV_ESCAPE_FIRSTCHAR) chsize = my_snprintf( octbuf, PV_ESCAPE_OCTBUFSIZE, - "%"UVxf, u); + "%" UVxf, u); else chsize = my_snprintf( octbuf, PV_ESCAPE_OCTBUFSIZE, ((flags & PERL_PV_ESCAPE_DWIM) && !isuni) - ? "%cx%02"UVxf - : "%cx{%02"UVxf"}", esc, u); + ? "%cx%02" UVxf + : "%cx{%02" UVxf "}", esc, u); } else if (flags & PERL_PV_ESCAPE_NOBACKSLASH) { chsize = 1; @@ -207,7 +207,7 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, default: if ( (flags & PERL_PV_ESCAPE_DWIM) && c != '\0' ) { chsize = my_snprintf( octbuf, PV_ESCAPE_OCTBUFSIZE, - isuni ? "%cx{%02"UVxf"}" : "%cx%02"UVxf, + isuni ? "%cx{%02" UVxf "}" : "%cx%02" UVxf, esc, u); } else if ( (pv+readsize < end) && isDIGIT((U8)*(pv+readsize)) ) @@ -424,7 +424,7 @@ Perl_sv_peek(pTHX_ SV *sv) if (is_tmp || SvREFCNT(sv) > 1) { Perl_sv_catpvf(aTHX_ t, "<"); if (SvREFCNT(sv) > 1) - Perl_sv_catpvf(aTHX_ t, "%"UVuf, (UV)SvREFCNT(sv)); + Perl_sv_catpvf(aTHX_ t, "%" UVuf, (UV)SvREFCNT(sv)); if (is_tmp) Perl_sv_catpvf(aTHX_ t, "%s", SvTEMP(t) ? "T" : "t"); Perl_sv_catpvf(aTHX_ t, ">"); @@ -481,14 +481,14 @@ Perl_sv_peek(pTHX_ SV *sv) } else if (SvNOKp(sv)) { STORE_LC_NUMERIC_UNDERLYING_SET_STANDARD(); - Perl_sv_catpvf(aTHX_ t, "(%"NVgf")",SvNVX(sv)); + Perl_sv_catpvf(aTHX_ t, "(%" NVgf ")",SvNVX(sv)); RESTORE_LC_NUMERIC_UNDERLYING(); } else if (SvIOKp(sv)) { if (SvIsUV(sv)) - Perl_sv_catpvf(aTHX_ t, "(%"UVuf")", (UV)SvUVX(sv)); + Perl_sv_catpvf(aTHX_ t, "(%" UVuf ")", (UV)SvUVX(sv)); else - Perl_sv_catpvf(aTHX_ t, "(%"IVdf")", (IV)SvIVX(sv)); + Perl_sv_catpvf(aTHX_ t, "(%" IVdf ")", (IV)SvIVX(sv)); } else sv_catpv(t, "()"); @@ -620,7 +620,7 @@ Perl_dump_sub_perl(pTHX_ const GV *gv, bool justperl) Perl_dump_indent(aTHX_ 0, Perl_debug_log, "\nSUB %s = ", generic_pv_escape(tmpsv, name, len, SvUTF8(sv))); if (CvISXSUB(GvCV(gv))) - Perl_dump_indent(aTHX_ 0, Perl_debug_log, "(xsub 0x%"UVxf" %d)\n", + Perl_dump_indent(aTHX_ 0, Perl_debug_log, "(xsub 0x%" UVxf " %d)\n", PTR2UV(CvXSUB(GvCV(gv))), (int)CvXSUBANY(GvCV(gv)).any_i32); else if (CvROOT(GvCV(gv))) @@ -670,7 +670,7 @@ Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) Perl_dump_indent(aTHX_ level, file, "PMf_PRE (RUNTIME)\n"); if (pm->op_type == OP_SPLIT) - Perl_dump_indent(aTHX_ level, file, "TARGOFF/GV = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, "TARGOFF/GV = 0x%" UVxf "\n", PTR2UV(pm->op_pmreplrootu.op_pmtargetgv)); else { if (pm->op_pmreplrootu.op_pmreplroot) { @@ -685,7 +685,7 @@ Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) do_op_dump(level, file, pm->op_code_list); } else - Perl_dump_indent(aTHX_ level, file, "CODE_LIST = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, "CODE_LIST = 0x%" UVxf "\n", PTR2UV(pm->op_code_list)); } if (pm->op_pmflags || (PM_GETRE(pm) && RX_CHECK_SUBSTR(PM_GETRE(pm)))) { @@ -803,7 +803,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) level++; seq = sequence_num(o); if (seq) - PerlIO_printf(file, "%-4"UVuf, seq); + PerlIO_printf(file, "%-4" UVuf, seq); else PerlIO_printf(file, "????"); PerlIO_printf(file, @@ -811,7 +811,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) (int)(PL_dumpindent*level-4), "", OP_NAME(o)); if (o->op_next) PerlIO_printf(file, - o->op_type == OP_NULL ? "(%"UVuf")\n" : "%"UVuf"\n", + o->op_type == OP_NULL ? "(%" UVuf ")\n" : "%" UVuf "\n", sequence_num(o->op_next)); else PerlIO_printf(file, "NULL\n"); @@ -823,7 +823,8 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) Perl_dump_indent(aTHX_ level, file, "TARG = %ld\n", (long)o->op_targ); } #ifdef DUMPADDR - Perl_dump_indent(aTHX_ level, file, "ADDR = 0x%"UVxf" => 0x%"UVxf"\n", (UV)o, (UV)o->op_next); + Perl_dump_indent(aTHX_ level, file, "ADDR = 0x%" UVxf " => 0x%" UVxf "\n", + (UV)o, (UV)o->op_next); #endif if (o->op_flags || o->op_slabbed || o->op_savefree || o->op_static) { @@ -909,7 +910,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) sv_catpv(tmpsv, "="); } if (enum_label == -1) - Perl_sv_catpvf(aTHX_ tmpsv, "0x%"UVxf, (UV)val); + Perl_sv_catpvf(aTHX_ tmpsv, "0x%" UVxf, (UV)val); else sv_catpv(tmpsv, &PL_op_private_labels[enum_label]); @@ -928,14 +929,14 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) } if (oppriv) { sv_catpv(tmpsv, ","); - Perl_sv_catpvf(aTHX_ tmpsv, "0x%"UVxf, (UV)oppriv); + Perl_sv_catpvf(aTHX_ tmpsv, "0x%" UVxf, (UV)oppriv); } } if (tmpsv && SvCUR(tmpsv)) { Perl_dump_indent(aTHX_ level, file, "PRIVATE = (%s)\n", SvPVX_const(tmpsv) + 1); } else - Perl_dump_indent(aTHX_ level, file, "PRIVATE = (0x%"UVxf")\n", - (UV)oppriv); + Perl_dump_indent(aTHX_ level, file, "PRIVATE = (0x%" UVxf ")\n", + (UV)oppriv); } switch (optype) { @@ -969,7 +970,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) Perl_dump_indent(aTHX_ level, file, "ARGS = \n"); for (i=0; i < count; i++) - Perl_dump_indent(aTHX_ level+1, file, "%"UVuf" => 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level+1, file, "%" UVuf " => 0x%" UVxf "\n", i, items[i].uv); break; } @@ -993,7 +994,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) case OP_NEXTSTATE: case OP_DBSTATE: if (CopLINE(cCOPo)) - Perl_dump_indent(aTHX_ level, file, "LINE = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file, "LINE = %" UVuf "\n", (UV)CopLINE(cCOPo)); if (CopSTASHPV(cCOPo)) { SV* tmpsv = newSVpvs_flags("", SVs_TEMP); @@ -1020,17 +1021,17 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) case OP_ENTERLOOP: Perl_dump_indent(aTHX_ level, file, "REDO ===> "); if (cLOOPo->op_redoop) - PerlIO_printf(file, "%"UVuf"\n", sequence_num(cLOOPo->op_redoop)); + PerlIO_printf(file, "%" UVuf "\n", sequence_num(cLOOPo->op_redoop)); else PerlIO_printf(file, "DONE\n"); Perl_dump_indent(aTHX_ level, file, "NEXT ===> "); if (cLOOPo->op_nextop) - PerlIO_printf(file, "%"UVuf"\n", sequence_num(cLOOPo->op_nextop)); + PerlIO_printf(file, "%" UVuf "\n", sequence_num(cLOOPo->op_nextop)); else PerlIO_printf(file, "DONE\n"); Perl_dump_indent(aTHX_ level, file, "LAST ===> "); if (cLOOPo->op_lastop) - PerlIO_printf(file, "%"UVuf"\n", sequence_num(cLOOPo->op_lastop)); + PerlIO_printf(file, "%" UVuf "\n", sequence_num(cLOOPo->op_lastop)); else PerlIO_printf(file, "DONE\n"); break; @@ -1042,7 +1043,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) case OP_AND: Perl_dump_indent(aTHX_ level, file, "OTHER ===> "); if (cLOGOPo->op_other) - PerlIO_printf(file, "%"UVuf"\n", sequence_num(cLOGOPo->op_other)); + PerlIO_printf(file, "%" UVuf "\n", sequence_num(cLOGOPo->op_other)); else PerlIO_printf(file, "DONE\n"); break; @@ -1059,7 +1060,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) case OP_LEAVEWRITE: case OP_SCOPE: if (o->op_private & OPpREFCOUNTED) - Perl_dump_indent(aTHX_ level, file, "REFCNT = %"UVuf"\n", (UV)o->op_targ); + Perl_dump_indent(aTHX_ level, file, "REFCNT = %" UVuf "\n", (UV)o->op_targ); break; default: break; @@ -1132,7 +1133,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 for (; mg; mg = mg->mg_moremagic) { Perl_dump_indent(aTHX_ level, file, - " MAGIC = 0x%"UVxf"\n", PTR2UV(mg)); + " MAGIC = 0x%" UVxf "\n", PTR2UV(mg)); if (mg->mg_virtual) { const MGVTBL * const v = mg->mg_virtual; if (v >= PL_magic_vtables @@ -1141,7 +1142,8 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 Perl_dump_indent(aTHX_ level, file, " MG_VIRTUAL = &PL_vtbl_%s\n", PL_magic_vtable_names[i]); } else - Perl_dump_indent(aTHX_ level, file, " MG_VIRTUAL = 0x%"UVxf"\n", PTR2UV(v)); + Perl_dump_indent(aTHX_ level, file, " MG_VIRTUAL = 0x%" + UVxf "\n", PTR2UV(v)); } else Perl_dump_indent(aTHX_ level, file, " MG_VIRTUAL = 0\n"); @@ -1189,7 +1191,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 Perl_dump_indent(aTHX_ level, file, " BYTES\n"); } if (mg->mg_obj) { - Perl_dump_indent(aTHX_ level, file, " MG_OBJ = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " MG_OBJ = 0x%" UVxf "\n", PTR2UV(mg->mg_obj)); if (mg->mg_type == PERL_MAGIC_qr) { REGEXP* const re = (REGEXP *)mg->mg_obj; @@ -1201,7 +1203,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 (RX_UTF8(re) ? PERL_PV_ESCAPE_UNI : 0)) ); Perl_dump_indent(aTHX_ level+1, file, " PAT = %s\n", s); - Perl_dump_indent(aTHX_ level+1, file, " REFCNT = %"IVdf"\n", + Perl_dump_indent(aTHX_ level+1, file, " REFCNT = %" IVdf "\n", (IV)RX_REFCNT(re)); } if (mg->mg_flags & MGf_REFCOUNTED) @@ -1210,7 +1212,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 if (mg->mg_len) Perl_dump_indent(aTHX_ level, file, " MG_LEN = %ld\n", (long)mg->mg_len); if (mg->mg_ptr) { - Perl_dump_indent(aTHX_ level, file, " MG_PTR = 0x%"UVxf, PTR2UV(mg->mg_ptr)); + Perl_dump_indent(aTHX_ level, file, " MG_PTR = 0x%" UVxf, PTR2UV(mg->mg_ptr)); if (mg->mg_len >= 0) { if (mg->mg_type != PERL_MAGIC_utf8) { SV * const sv = newSVpvs(""); @@ -1239,7 +1241,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 IV i; for (i = 0; i < PERL_MAGIC_UTF8_CACHESIZE; i++) Perl_dump_indent(aTHX_ level, file, - " %2"IVdf": %"UVuf" -> %"UVuf"\n", + " %2" IVdf ": %" UVuf " -> %" UVuf "\n", i, (UV)cache[i * 2], (UV)cache[i * 2 + 1]); @@ -1261,7 +1263,7 @@ Perl_do_hv_dump(pTHX_ I32 level, PerlIO *file, const char *name, HV *sv) PERL_ARGS_ASSERT_DO_HV_DUMP; - Perl_dump_indent(aTHX_ level, file, "%s = 0x%"UVxf, name, PTR2UV(sv)); + Perl_dump_indent(aTHX_ level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); if (sv && (hvname = HvNAME_get(sv))) { /* we have to use pv_display and HvNAMELEN_get() so that we display the real package @@ -1282,7 +1284,7 @@ Perl_do_gv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv) { PERL_ARGS_ASSERT_DO_GV_DUMP; - Perl_dump_indent(aTHX_ level, file, "%s = 0x%"UVxf, name, PTR2UV(sv)); + Perl_dump_indent(aTHX_ level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); if (sv && GvNAME(sv)) { SV * const tmpsv = newSVpvs(""); PerlIO_printf(file, "\t\"%s\"\n", @@ -1297,7 +1299,7 @@ Perl_do_gvgv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv) { PERL_ARGS_ASSERT_DO_GVGV_DUMP; - Perl_dump_indent(aTHX_ level, file, "%s = 0x%"UVxf, name, PTR2UV(sv)); + Perl_dump_indent(aTHX_ level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); if (sv && GvNAME(sv)) { SV *tmp = newSVpvs_flags("", SVs_TEMP); const char *hvname; @@ -1457,7 +1459,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo /* process general SV flags */ d = Perl_newSVpvf(aTHX_ - "(0x%"UVxf") at 0x%"UVxf"\n%*s REFCNT = %"IVdf"\n%*s FLAGS = (", + "(0x%" UVxf ") at 0x%" UVxf "\n%*s REFCNT = %" IVdf "\n%*s FLAGS = (", PTR2UV(SvANY(sv)), PTR2UV(sv), (int)(PL_dumpindent*level), "", (IV)SvREFCNT(sv), (int)(PL_dumpindent*level), ""); @@ -1530,7 +1532,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo #ifdef DEBUG_LEAKING_SCALARS Perl_dump_indent(aTHX_ level, file, - "ALLOCATED at %s:%d %s %s (parent 0x%"UVxf"); serial %"UVuf"\n", + "ALLOCATED at %s:%d %s %s (parent 0x%" UVxf "); serial %" UVuf "\n", sv->sv_debug_file ? sv->sv_debug_file : "(unknown)", sv->sv_debug_line, sv->sv_debug_inpad ? "for" : "by", @@ -1551,7 +1553,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo return; } } else { - PerlIO_printf(file, "UNKNOWN(0x%"UVxf") %s\n", (UV)type, s); + PerlIO_printf(file, "UNKNOWN(0x%" UVxf ") %s\n", (UV)type, s); SvREFCNT_dec_NN(d); return; } @@ -1564,9 +1566,9 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo || (type == SVt_IV && !SvROK(sv))) { if (SvIsUV(sv) ) - Perl_dump_indent(aTHX_ level, file, " UV = %"UVuf, (UV)SvUVX(sv)); + Perl_dump_indent(aTHX_ level, file, " UV = %" UVuf, (UV)SvUVX(sv)); else - Perl_dump_indent(aTHX_ level, file, " IV = %"IVdf, (IV)SvIVX(sv)); + Perl_dump_indent(aTHX_ level, file, " IV = %" IVdf, (IV)SvIVX(sv)); (void)PerlIO_putc(file, '\n'); } @@ -1580,7 +1582,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } if (SvROK(sv)) { - Perl_dump_indent(aTHX_ level, file, " RV = 0x%"UVxf"\n", PTR2UV(SvRV(sv))); + Perl_dump_indent(aTHX_ level, file, " RV = 0x%" UVxf "\n", + PTR2UV(SvRV(sv))); if (nest < maxnest) do_sv_dump(level+1, file, SvRV(sv), nest+1, maxnest, dumpops, pvlim); } @@ -1599,12 +1602,13 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo STRLEN delta; if (SvOOK(sv)) { SvOOK_offset(sv, delta); - Perl_dump_indent(aTHX_ level, file," OFFSET = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file," OFFSET = %" UVuf "\n", (UV) delta); } else { delta = 0; } - Perl_dump_indent(aTHX_ level, file," PV = 0x%"UVxf" ", PTR2UV(ptr)); + Perl_dump_indent(aTHX_ level, file," PV = 0x%" UVxf " ", + PTR2UV(ptr)); if (SvOOK(sv)) { PerlIO_printf(file, "( %s . ) ", pv_display(d, ptr - delta, delta, 0, @@ -1625,9 +1629,9 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo UNI_DISPLAY_QQ)); PerlIO_printf(file, "\n"); } - Perl_dump_indent(aTHX_ level, file, " CUR = %"IVdf"\n", (IV)SvCUR(sv)); + Perl_dump_indent(aTHX_ level, file, " CUR = %" IVdf "\n", (IV)SvCUR(sv)); if (!re) - Perl_dump_indent(aTHX_ level, file, " LEN = %"IVdf"\n", + Perl_dump_indent(aTHX_ level, file, " LEN = %" IVdf "\n", (IV)SvLEN(sv)); #ifdef PERL_COPY_ON_WRITE if (SvIsCOW(sv) && SvLEN(sv)) @@ -1646,7 +1650,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo do_hv_dump(level, file, " STASH", SvSTASH(sv)); if ((type == SVt_PVMG || type == SVt_PVLV) && SvVALID(sv)) { - Perl_dump_indent(aTHX_ level, file, " USEFUL = %"IVdf"\n", (IV)BmUSEFUL(sv)); + Perl_dump_indent(aTHX_ level, file, " USEFUL = %" IVdf "\n", + (IV)BmUSEFUL(sv)); } } @@ -1654,15 +1659,20 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo switch (type) { case SVt_PVAV: - Perl_dump_indent(aTHX_ level, file, " ARRAY = 0x%"UVxf, PTR2UV(AvARRAY(sv))); + Perl_dump_indent(aTHX_ level, file, " ARRAY = 0x%" UVxf, + PTR2UV(AvARRAY(sv))); if (AvARRAY(sv) != AvALLOC(sv)) { - PerlIO_printf(file, " (offset=%"IVdf")\n", (IV)(AvARRAY(sv) - AvALLOC(sv))); - Perl_dump_indent(aTHX_ level, file, " ALLOC = 0x%"UVxf"\n", PTR2UV(AvALLOC(sv))); + PerlIO_printf(file, " (offset=%" IVdf ")\n", + (IV)(AvARRAY(sv) - AvALLOC(sv))); + Perl_dump_indent(aTHX_ level, file, " ALLOC = 0x%" UVxf "\n", + PTR2UV(AvALLOC(sv))); } else (void)PerlIO_putc(file, '\n'); - Perl_dump_indent(aTHX_ level, file, " FILL = %"IVdf"\n", (IV)AvFILLp(sv)); - Perl_dump_indent(aTHX_ level, file, " MAX = %"IVdf"\n", (IV)AvMAX(sv)); + Perl_dump_indent(aTHX_ level, file, " FILL = %" IVdf "\n", + (IV)AvFILLp(sv)); + Perl_dump_indent(aTHX_ level, file, " MAX = %" IVdf "\n", + (IV)AvMAX(sv)); SvPVCLEAR(d); if (AvREAL(sv)) sv_catpv(d, ",REAL"); if (AvREIFY(sv)) sv_catpv(d, ",REIFY"); @@ -1676,7 +1686,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo count++, svp++) { SV* const elt = *svp; - Perl_dump_indent(aTHX_ level + 1, file, "Elt No. %"IVdf"\n", (IV)count); + Perl_dump_indent(aTHX_ level + 1, file, "Elt No. %" IVdf "\n", + (IV)count); do_sv_dump(level+1, file, elt, nest+1, maxnest, dumpops, pvlim); } } @@ -1685,10 +1696,10 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo U32 usedkeys; if (SvOOK(sv)) { struct xpvhv_aux *const aux = HvAUX(sv); - Perl_dump_indent(aTHX_ level, file, " AUX_FLAGS = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file, " AUX_FLAGS = %" UVuf "\n", (UV)aux->xhv_aux_flags); } - Perl_dump_indent(aTHX_ level, file, " ARRAY = 0x%"UVxf, PTR2UV(HvARRAY(sv))); + Perl_dump_indent(aTHX_ level, file, " ARRAY = 0x%" UVxf, PTR2UV(HvARRAY(sv))); usedkeys = HvUSEDKEYS(sv); if (HvARRAY(sv) && usedkeys) { /* Show distribution of HEs in the ARRAY */ @@ -1741,10 +1752,12 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo theoret = usedkeys; theoret += theoret * (theoret-1)/pow2; (void)PerlIO_putc(file, '\n'); - Perl_dump_indent(aTHX_ level, file, " hash quality = %.1"NVff"%%", theoret/sum*100); + Perl_dump_indent(aTHX_ level, file, " hash quality = %.1" + NVff "%%", theoret/sum*100); } (void)PerlIO_putc(file, '\n'); - Perl_dump_indent(aTHX_ level, file, " KEYS = %"IVdf"\n", (IV)usedkeys); + Perl_dump_indent(aTHX_ level, file, " KEYS = %" IVdf "\n", + (IV)usedkeys); { STRLEN count = 0; HE **ents = HvARRAY(sv); @@ -1759,17 +1772,22 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } while (++ents <= last); } - Perl_dump_indent(aTHX_ level, file, " FILL = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file, " FILL = %" UVuf "\n", (UV)count); } - Perl_dump_indent(aTHX_ level, file, " MAX = %"IVdf"\n", (IV)HvMAX(sv)); + Perl_dump_indent(aTHX_ level, file, " MAX = %" IVdf "\n", + (IV)HvMAX(sv)); if (SvOOK(sv)) { - Perl_dump_indent(aTHX_ level, file, " RITER = %"IVdf"\n", (IV)HvRITER_get(sv)); - Perl_dump_indent(aTHX_ level, file, " EITER = 0x%"UVxf"\n", PTR2UV(HvEITER_get(sv))); + Perl_dump_indent(aTHX_ level, file, " RITER = %" IVdf "\n", + (IV)HvRITER_get(sv)); + Perl_dump_indent(aTHX_ level, file, " EITER = 0x%" UVxf "\n", + PTR2UV(HvEITER_get(sv))); #ifdef PERL_HASH_RANDOMIZE_KEYS - Perl_dump_indent(aTHX_ level, file, " RAND = 0x%"UVxf, (UV)HvRAND_get(sv)); + Perl_dump_indent(aTHX_ level, file, " RAND = 0x%" UVxf, + (UV)HvRAND_get(sv)); if (HvRAND_get(sv) != HvLASTRAND_get(sv) && HvRITER_get(sv) != -1 ) { - PerlIO_printf(file, " (LAST = 0x%"UVxf")", (UV)HvLASTRAND_get(sv)); + PerlIO_printf(file, " (LAST = 0x%" UVxf ")", + (UV)HvLASTRAND_get(sv)); } #endif (void)PerlIO_putc(file, '\n'); @@ -1777,7 +1795,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo { MAGIC * const mg = mg_find(sv, PERL_MAGIC_symtab); if (mg && mg->mg_obj) { - Perl_dump_indent(aTHX_ level, file, " PMROOT = 0x%"UVxf"\n", PTR2UV(mg->mg_obj)); + Perl_dump_indent(aTHX_ level, file, " PMROOT = 0x%" UVxf "\n", PTR2UV(mg->mg_obj)); } } { @@ -1795,7 +1813,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo struct mro_meta * const meta = HvAUX(sv)->xhv_mro_meta; if (HvAUX(sv)->xhv_name_count) Perl_dump_indent(aTHX_ - level, file, " NAMECOUNT = %"IVdf"\n", + level, file, " NAMECOUNT = %" IVdf "\n", (IV)HvAUX(sv)->xhv_name_count ); if (HvAUX(sv)->xhv_name_u.xhvnameu_name && HvENAME_HEK_NN(sv)) { @@ -1833,42 +1851,47 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } } if (backrefs) { - Perl_dump_indent(aTHX_ level, file, " BACKREFS = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " BACKREFS = 0x%" UVxf "\n", PTR2UV(backrefs)); do_sv_dump(level+1, file, MUTABLE_SV(backrefs), nest+1, maxnest, dumpops, pvlim); } if (meta) { SV* tmpsv = newSVpvs_flags("", SVs_TEMP); - Perl_dump_indent(aTHX_ level, file, " MRO_WHICH = \"%s\" (0x%"UVxf")\n", + Perl_dump_indent(aTHX_ level, file, " MRO_WHICH = \"%s\" (0x%" + UVxf ")\n", generic_pv_escape( tmpsv, meta->mro_which->name, meta->mro_which->length, (meta->mro_which->kflags & HVhek_UTF8)), PTR2UV(meta->mro_which)); - Perl_dump_indent(aTHX_ level, file, " CACHE_GEN = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " CACHE_GEN = 0x%" + UVxf "\n", (UV)meta->cache_gen); - Perl_dump_indent(aTHX_ level, file, " PKG_GEN = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " PKG_GEN = 0x%" UVxf "\n", (UV)meta->pkg_gen); if (meta->mro_linear_all) { - Perl_dump_indent(aTHX_ level, file, " MRO_LINEAR_ALL = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " MRO_LINEAR_ALL = 0x%" + UVxf "\n", PTR2UV(meta->mro_linear_all)); do_sv_dump(level+1, file, MUTABLE_SV(meta->mro_linear_all), nest+1, maxnest, dumpops, pvlim); } if (meta->mro_linear_current) { - Perl_dump_indent(aTHX_ level, file, " MRO_LINEAR_CURRENT = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, + " MRO_LINEAR_CURRENT = 0x%" UVxf "\n", PTR2UV(meta->mro_linear_current)); do_sv_dump(level+1, file, MUTABLE_SV(meta->mro_linear_current), nest+1, maxnest, dumpops, pvlim); } if (meta->mro_nextmethod) { - Perl_dump_indent(aTHX_ level, file, " MRO_NEXTMETHOD = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, + " MRO_NEXTMETHOD = 0x%" UVxf "\n", PTR2UV(meta->mro_nextmethod)); do_sv_dump(level+1, file, MUTABLE_SV(meta->mro_nextmethod), nest+1, maxnest, dumpops, pvlim); } if (meta->isa) { - Perl_dump_indent(aTHX_ level, file, " ISA = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " ISA = 0x%" UVxf "\n", PTR2UV(meta->isa)); do_sv_dump(level+1, file, MUTABLE_SV(meta->isa), nest+1, maxnest, dumpops, pvlim); @@ -1902,7 +1925,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo PerlIO_printf(file, "[UTF8 \"%s\"] ", sv_uni_display(d, keysv, 6 * SvCUR(keysv), UNI_DISPLAY_QQ)); if (HvEITER_get(hv) == he) PerlIO_printf(file, "[CURRENT] "); - PerlIO_printf(file, "HASH = 0x%"UVxf"\n", (UV) hash); + PerlIO_printf(file, "HASH = 0x%" UVxf "\n", (UV) hash); do_sv_dump(level+1, file, elt, nest+1, maxnest, dumpops, pvlim); } } @@ -1934,15 +1957,15 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo if (CvSTART(sv)) { if (CvSLABBED(sv)) Perl_dump_indent(aTHX_ level, file, - " SLAB = 0x%"UVxf"\n", + " SLAB = 0x%" UVxf "\n", PTR2UV(CvSTART(sv))); else Perl_dump_indent(aTHX_ level, file, - " START = 0x%"UVxf" ===> %"IVdf"\n", + " START = 0x%" UVxf " ===> %" IVdf "\n", PTR2UV(CvSTART(sv)), (IV)sequence_num(CvSTART(sv))); } - Perl_dump_indent(aTHX_ level, file, " ROOT = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " ROOT = 0x%" UVxf "\n", PTR2UV(CvROOT(sv))); if (CvROOT(sv) && dumpops) { do_op_dump(level+1, file, CvROOT(sv)); @@ -1950,16 +1973,16 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } else { SV * const constant = cv_const_sv((const CV *)sv); - Perl_dump_indent(aTHX_ level, file, " XSUB = 0x%"UVxf"\n", PTR2UV(CvXSUB(sv))); + Perl_dump_indent(aTHX_ level, file, " XSUB = 0x%" UVxf "\n", PTR2UV(CvXSUB(sv))); if (constant) { - Perl_dump_indent(aTHX_ level, file, " XSUBANY = 0x%"UVxf + Perl_dump_indent(aTHX_ level, file, " XSUBANY = 0x%" UVxf " (CONST SV)\n", PTR2UV(CvXSUBANY(sv).any_ptr)); do_sv_dump(level+1, file, constant, nest+1, maxnest, dumpops, pvlim); } else { - Perl_dump_indent(aTHX_ level, file, " XSUBANY = %"IVdf"\n", + Perl_dump_indent(aTHX_ level, file, " XSUBANY = %" IVdf "\n", (IV)CvXSUBANY(sv).any_i32); } } @@ -1968,11 +1991,13 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo HEK_KEY(CvNAME_HEK((CV *)sv))); else do_gvgv_dump(level, file, " GVGV::GV", CvGV(sv)); Perl_dump_indent(aTHX_ level, file, " FILE = \"%s\"\n", CvFILE(sv)); - Perl_dump_indent(aTHX_ level, file, " DEPTH = %"IVdf"\n", (IV)CvDEPTH(sv)); - Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%"UVxf"\n", (UV)CvFLAGS(sv)); - Perl_dump_indent(aTHX_ level, file, " OUTSIDE_SEQ = %"UVuf"\n", (UV)CvOUTSIDE_SEQ(sv)); + Perl_dump_indent(aTHX_ level, file, " DEPTH = %" + IVdf "\n", (IV)CvDEPTH(sv)); + Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%" UVxf "\n", + (UV)CvFLAGS(sv)); + Perl_dump_indent(aTHX_ level, file, " OUTSIDE_SEQ = %" UVuf "\n", (UV)CvOUTSIDE_SEQ(sv)); if (!CvISXSUB(sv)) { - Perl_dump_indent(aTHX_ level, file, " PADLIST = 0x%"UVxf"\n", PTR2UV(CvPADLIST(sv))); + Perl_dump_indent(aTHX_ level, file, " PADLIST = 0x%" UVxf "\n", PTR2UV(CvPADLIST(sv))); if (nest < maxnest) { do_dump_pad(level+1, file, CvPADLIST(sv), 0); } @@ -1981,7 +2006,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo Perl_dump_indent(aTHX_ level, file, " HSCXT = 0x%p\n", CvHSCXT(sv)); { const CV * const outside = CvOUTSIDE(sv); - Perl_dump_indent(aTHX_ level, file, " OUTSIDE = 0x%"UVxf" (%s)\n", + Perl_dump_indent(aTHX_ level, file, " OUTSIDE = 0x%" UVxf " (%s)\n", PTR2UV(outside), (!outside ? "null" : CvANON(outside) ? "ANON" @@ -2004,10 +2029,10 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo case SVt_PVLV: if (type == SVt_PVLV) { Perl_dump_indent(aTHX_ level, file, " TYPE = %c\n", LvTYPE(sv)); - Perl_dump_indent(aTHX_ level, file, " TARGOFF = %"IVdf"\n", (IV)LvTARGOFF(sv)); - Perl_dump_indent(aTHX_ level, file, " TARGLEN = %"IVdf"\n", (IV)LvTARGLEN(sv)); - Perl_dump_indent(aTHX_ level, file, " TARG = 0x%"UVxf"\n", PTR2UV(LvTARG(sv))); - Perl_dump_indent(aTHX_ level, file, " FLAGS = %"IVdf"\n", (IV)LvFLAGS(sv)); + Perl_dump_indent(aTHX_ level, file, " TARGOFF = %" IVdf "\n", (IV)LvTARGOFF(sv)); + Perl_dump_indent(aTHX_ level, file, " TARGLEN = %" IVdf "\n", (IV)LvTARGLEN(sv)); + Perl_dump_indent(aTHX_ level, file, " TARG = 0x%" UVxf "\n", PTR2UV(LvTARG(sv))); + Perl_dump_indent(aTHX_ level, file, " FLAGS = %" IVdf "\n", (IV)LvFLAGS(sv)); if (isALPHA_FOLD_NE(LvTYPE(sv), 't')) do_sv_dump(level+1, file, LvTARG(sv), nest+1, maxnest, dumpops, pvlim); @@ -2022,42 +2047,42 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo GvNAMELEN(sv), GvNAMEUTF8(sv))); } - Perl_dump_indent(aTHX_ level, file, " NAMELEN = %"IVdf"\n", (IV)GvNAMELEN(sv)); + Perl_dump_indent(aTHX_ level, file, " NAMELEN = %" IVdf "\n", (IV)GvNAMELEN(sv)); do_hv_dump (level, file, " GvSTASH", GvSTASH(sv)); - Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%"UVxf"\n", (UV)GvFLAGS(sv)); - Perl_dump_indent(aTHX_ level, file, " GP = 0x%"UVxf"\n", PTR2UV(GvGP(sv))); + Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%" UVxf "\n", (UV)GvFLAGS(sv)); + Perl_dump_indent(aTHX_ level, file, " GP = 0x%" UVxf "\n", PTR2UV(GvGP(sv))); if (!GvGP(sv)) break; - Perl_dump_indent(aTHX_ level, file, " SV = 0x%"UVxf"\n", PTR2UV(GvSV(sv))); - Perl_dump_indent(aTHX_ level, file, " REFCNT = %"IVdf"\n", (IV)GvREFCNT(sv)); - Perl_dump_indent(aTHX_ level, file, " IO = 0x%"UVxf"\n", PTR2UV(GvIOp(sv))); - Perl_dump_indent(aTHX_ level, file, " FORM = 0x%"UVxf" \n", PTR2UV(GvFORM(sv))); - Perl_dump_indent(aTHX_ level, file, " AV = 0x%"UVxf"\n", PTR2UV(GvAV(sv))); - Perl_dump_indent(aTHX_ level, file, " HV = 0x%"UVxf"\n", PTR2UV(GvHV(sv))); - Perl_dump_indent(aTHX_ level, file, " CV = 0x%"UVxf"\n", PTR2UV(GvCV(sv))); - Perl_dump_indent(aTHX_ level, file, " CVGEN = 0x%"UVxf"\n", (UV)GvCVGEN(sv)); - Perl_dump_indent(aTHX_ level, file, " GPFLAGS = 0x%"UVxf + Perl_dump_indent(aTHX_ level, file, " SV = 0x%" UVxf "\n", PTR2UV(GvSV(sv))); + Perl_dump_indent(aTHX_ level, file, " REFCNT = %" IVdf "\n", (IV)GvREFCNT(sv)); + Perl_dump_indent(aTHX_ level, file, " IO = 0x%" UVxf "\n", PTR2UV(GvIOp(sv))); + Perl_dump_indent(aTHX_ level, file, " FORM = 0x%" UVxf " \n", PTR2UV(GvFORM(sv))); + Perl_dump_indent(aTHX_ level, file, " AV = 0x%" UVxf "\n", PTR2UV(GvAV(sv))); + Perl_dump_indent(aTHX_ level, file, " HV = 0x%" UVxf "\n", PTR2UV(GvHV(sv))); + Perl_dump_indent(aTHX_ level, file, " CV = 0x%" UVxf "\n", PTR2UV(GvCV(sv))); + Perl_dump_indent(aTHX_ level, file, " CVGEN = 0x%" UVxf "\n", (UV)GvCVGEN(sv)); + Perl_dump_indent(aTHX_ level, file, " GPFLAGS = 0x%" UVxf " (%s)\n", (UV)GvGPFLAGS(sv), ""); - Perl_dump_indent(aTHX_ level, file, " LINE = %"IVdf"\n", (IV)GvLINE(sv)); + Perl_dump_indent(aTHX_ level, file, " LINE = %" IVdf "\n", (IV)GvLINE(sv)); Perl_dump_indent(aTHX_ level, file, " FILE = \"%s\"\n", GvFILE(sv)); do_gv_dump (level, file, " EGV", GvEGV(sv)); break; case SVt_PVIO: - Perl_dump_indent(aTHX_ level, file, " IFP = 0x%"UVxf"\n", PTR2UV(IoIFP(sv))); - Perl_dump_indent(aTHX_ level, file, " OFP = 0x%"UVxf"\n", PTR2UV(IoOFP(sv))); - Perl_dump_indent(aTHX_ level, file, " DIRP = 0x%"UVxf"\n", PTR2UV(IoDIRP(sv))); - Perl_dump_indent(aTHX_ level, file, " LINES = %"IVdf"\n", (IV)IoLINES(sv)); - Perl_dump_indent(aTHX_ level, file, " PAGE = %"IVdf"\n", (IV)IoPAGE(sv)); - Perl_dump_indent(aTHX_ level, file, " PAGE_LEN = %"IVdf"\n", (IV)IoPAGE_LEN(sv)); - Perl_dump_indent(aTHX_ level, file, " LINES_LEFT = %"IVdf"\n", (IV)IoLINES_LEFT(sv)); + Perl_dump_indent(aTHX_ level, file, " IFP = 0x%" UVxf "\n", PTR2UV(IoIFP(sv))); + Perl_dump_indent(aTHX_ level, file, " OFP = 0x%" UVxf "\n", PTR2UV(IoOFP(sv))); + Perl_dump_indent(aTHX_ level, file, " DIRP = 0x%" UVxf "\n", PTR2UV(IoDIRP(sv))); + Perl_dump_indent(aTHX_ level, file, " LINES = %" IVdf "\n", (IV)IoLINES(sv)); + Perl_dump_indent(aTHX_ level, file, " PAGE = %" IVdf "\n", (IV)IoPAGE(sv)); + Perl_dump_indent(aTHX_ level, file, " PAGE_LEN = %" IVdf "\n", (IV)IoPAGE_LEN(sv)); + Perl_dump_indent(aTHX_ level, file, " LINES_LEFT = %" IVdf "\n", (IV)IoLINES_LEFT(sv)); if (IoTOP_NAME(sv)) Perl_dump_indent(aTHX_ level, file, " TOP_NAME = \"%s\"\n", IoTOP_NAME(sv)); if (!IoTOP_GV(sv) || SvTYPE(IoTOP_GV(sv)) == SVt_PVGV) do_gv_dump (level, file, " TOP_GV", IoTOP_GV(sv)); else { - Perl_dump_indent(aTHX_ level, file, " TOP_GV = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " TOP_GV = 0x%" UVxf "\n", PTR2UV(IoTOP_GV(sv))); do_sv_dump (level+1, file, MUTABLE_SV(IoTOP_GV(sv)), nest+1, maxnest, dumpops, pvlim); @@ -2069,7 +2094,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo if (!IoFMT_GV(sv) || SvTYPE(IoFMT_GV(sv)) == SVt_PVGV) do_gv_dump (level, file, " FMT_GV", IoFMT_GV(sv)); else { - Perl_dump_indent(aTHX_ level, file, " FMT_GV = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " FMT_GV = 0x%" UVxf "\n", PTR2UV(IoFMT_GV(sv))); do_sv_dump (level+1, file, MUTABLE_SV(IoFMT_GV(sv)), nest+1, maxnest, dumpops, pvlim); @@ -2079,7 +2104,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo if (!IoBOTTOM_GV(sv) || SvTYPE(IoBOTTOM_GV(sv)) == SVt_PVGV) do_gv_dump (level, file, " BOTTOM_GV", IoBOTTOM_GV(sv)); else { - Perl_dump_indent(aTHX_ level, file, " BOTTOM_GV = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " BOTTOM_GV = 0x%" UVxf "\n", PTR2UV(IoBOTTOM_GV(sv))); do_sv_dump (level+1, file, MUTABLE_SV(IoBOTTOM_GV(sv)), nest+1, maxnest, dumpops, pvlim); @@ -2088,7 +2113,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo Perl_dump_indent(aTHX_ level, file, " TYPE = '%c'\n", IoTYPE(sv)); else Perl_dump_indent(aTHX_ level, file, " TYPE = '\\%o'\n", IoTYPE(sv)); - Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%"UVxf"\n", (UV)IoFLAGS(sv)); + Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%" UVxf "\n", (UV)IoFLAGS(sv)); break; case SVt_REGEXP: dumpregexp: @@ -2104,67 +2129,67 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } \ } STMT_END SV_SET_STRINGIFY_REGEXP_FLAGS(d,r->compflags,regexp_extflags_names); - Perl_dump_indent(aTHX_ level, file, " COMPFLAGS = 0x%"UVxf" (%s)\n", + Perl_dump_indent(aTHX_ level, file, " COMPFLAGS = 0x%" UVxf " (%s)\n", (UV)(r->compflags), SvPVX_const(d)); SV_SET_STRINGIFY_REGEXP_FLAGS(d,r->extflags,regexp_extflags_names); - Perl_dump_indent(aTHX_ level, file, " EXTFLAGS = 0x%"UVxf" (%s)\n", + Perl_dump_indent(aTHX_ level, file, " EXTFLAGS = 0x%" UVxf " (%s)\n", (UV)(r->extflags), SvPVX_const(d)); - Perl_dump_indent(aTHX_ level, file, " ENGINE = 0x%"UVxf" (%s)\n", + Perl_dump_indent(aTHX_ level, file, " ENGINE = 0x%" UVxf " (%s)\n", PTR2UV(r->engine), (r->engine == &PL_core_reg_engine) ? "STANDARD" : "PLUG-IN" ); if (r->engine == &PL_core_reg_engine) { SV_SET_STRINGIFY_REGEXP_FLAGS(d,r->intflags,regexp_core_intflags_names); - Perl_dump_indent(aTHX_ level, file, " INTFLAGS = 0x%"UVxf" (%s)\n", + Perl_dump_indent(aTHX_ level, file, " INTFLAGS = 0x%" UVxf " (%s)\n", (UV)(r->intflags), SvPVX_const(d)); } else { - Perl_dump_indent(aTHX_ level, file, " INTFLAGS = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " INTFLAGS = 0x%" UVxf "\n", (UV)(r->intflags)); } #undef SV_SET_STRINGIFY_REGEXP_FLAGS - Perl_dump_indent(aTHX_ level, file, " NPARENS = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file, " NPARENS = %" UVuf "\n", (UV)(r->nparens)); - Perl_dump_indent(aTHX_ level, file, " LASTPAREN = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file, " LASTPAREN = %" UVuf "\n", (UV)(r->lastparen)); - Perl_dump_indent(aTHX_ level, file, " LASTCLOSEPAREN = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file, " LASTCLOSEPAREN = %" UVuf "\n", (UV)(r->lastcloseparen)); - Perl_dump_indent(aTHX_ level, file, " MINLEN = %"IVdf"\n", + Perl_dump_indent(aTHX_ level, file, " MINLEN = %" IVdf "\n", (IV)(r->minlen)); - Perl_dump_indent(aTHX_ level, file, " MINLENRET = %"IVdf"\n", + Perl_dump_indent(aTHX_ level, file, " MINLENRET = %" IVdf "\n", (IV)(r->minlenret)); - Perl_dump_indent(aTHX_ level, file, " GOFS = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file, " GOFS = %" UVuf "\n", (UV)(r->gofs)); - Perl_dump_indent(aTHX_ level, file, " PRE_PREFIX = %"UVuf"\n", + Perl_dump_indent(aTHX_ level, file, " PRE_PREFIX = %" UVuf "\n", (UV)(r->pre_prefix)); - Perl_dump_indent(aTHX_ level, file, " SUBLEN = %"IVdf"\n", + Perl_dump_indent(aTHX_ level, file, " SUBLEN = %" IVdf "\n", (IV)(r->sublen)); - Perl_dump_indent(aTHX_ level, file, " SUBOFFSET = %"IVdf"\n", + Perl_dump_indent(aTHX_ level, file, " SUBOFFSET = %" IVdf "\n", (IV)(r->suboffset)); - Perl_dump_indent(aTHX_ level, file, " SUBCOFFSET = %"IVdf"\n", + Perl_dump_indent(aTHX_ level, file, " SUBCOFFSET = %" IVdf "\n", (IV)(r->subcoffset)); if (r->subbeg) - Perl_dump_indent(aTHX_ level, file, " SUBBEG = 0x%"UVxf" %s\n", + Perl_dump_indent(aTHX_ level, file, " SUBBEG = 0x%" UVxf " %s\n", PTR2UV(r->subbeg), pv_display(d, r->subbeg, r->sublen, 50, pvlim)); else Perl_dump_indent(aTHX_ level, file, " SUBBEG = 0x0\n"); - Perl_dump_indent(aTHX_ level, file, " MOTHER_RE = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " MOTHER_RE = 0x%" UVxf "\n", PTR2UV(r->mother_re)); if (nest < maxnest && r->mother_re) do_sv_dump(level+1, file, (SV *)r->mother_re, nest+1, maxnest, dumpops, pvlim); - Perl_dump_indent(aTHX_ level, file, " PAREN_NAMES = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " PAREN_NAMES = 0x%" UVxf "\n", PTR2UV(r->paren_names)); - Perl_dump_indent(aTHX_ level, file, " SUBSTRS = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " SUBSTRS = 0x%" UVxf "\n", PTR2UV(r->substrs)); - Perl_dump_indent(aTHX_ level, file, " PPRIVATE = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " PPRIVATE = 0x%" UVxf "\n", PTR2UV(r->pprivate)); - Perl_dump_indent(aTHX_ level, file, " OFFS = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " OFFS = 0x%" UVxf "\n", PTR2UV(r->offs)); - Perl_dump_indent(aTHX_ level, file, " QR_ANONCV = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " QR_ANONCV = 0x%" UVxf "\n", PTR2UV(r->qr_anoncv)); #ifdef PERL_ANY_COW - Perl_dump_indent(aTHX_ level, file, " SAVED_COPY = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " SAVED_COPY = 0x%" UVxf "\n", PTR2UV(r->saved_copy)); #endif } @@ -2212,7 +2237,7 @@ Perl_runops_debug(pTHX) SAVETMPS; if (PL_watchaddr && (*PL_watchaddr != PL_watchok)) PerlIO_printf(Perl_debug_log, - "WARNING: %"UVxf" changed from %"UVxf" to %"UVxf"\n", + "WARNING: %" UVxf " changed from %" UVxf " to %" UVxf "\n", PTR2UV(PL_watchaddr), PTR2UV(PL_watchok), PTR2UV(*PL_watchaddr)); if (DEBUG_s_TEST_) { @@ -2259,9 +2284,9 @@ S_deb_padvar(pTHX_ PADOFFSET off, int n, bool paren) PerlIO_printf(Perl_debug_log, "("); for (i = 0; i < n; i++) { if (comppad && (sv = padnamelist_fetch(comppad, off + i))) - PerlIO_printf(Perl_debug_log, "%"PNf, PNfARG(sv)); + PerlIO_printf(Perl_debug_log, "%" PNf, PNfARG(sv)); else - PerlIO_printf(Perl_debug_log, "[%"UVuf"]", + PerlIO_printf(Perl_debug_log, "[%" UVuf "]", (UV)(off+i)); if (i < n - 1) PerlIO_printf(Perl_debug_log, ","); @@ -2293,14 +2318,14 @@ S_append_padvar(pTHX_ PADOFFSET off, CV *cv, SV *out, int n, if (namepad && (sv = padnamelist_fetch(namepad, off + i))) { STRLEN cur = SvCUR(out); - Perl_sv_catpvf(aTHX_ out, "[%"UTF8f, + Perl_sv_catpvf(aTHX_ out, "[%" UTF8f, UTF8fARG(1, PadnameLEN(sv) - 1, PadnamePV(sv) + 1)); if (is_scalar) SvPVX(out)[cur] = '$'; } else - Perl_sv_catpvf(aTHX_ out, "[%"UVuf"]", (UV)(off+i)); + Perl_sv_catpvf(aTHX_ out, "[%" UVuf "]", (UV)(off+i)); if (i < n - 1) sv_catpvs_nomg(out, ","); } @@ -2319,7 +2344,7 @@ S_append_gv_name(pTHX_ GV *gv, SV *out) } sv = newSV(0); gv_fullname4(sv, gv, NULL, FALSE); - Perl_sv_catpvf(aTHX_ out, "$%"SVf, SVfARG(sv)); + Perl_sv_catpvf(aTHX_ out, "$%" SVf, SVfARG(sv)); SvREFCNT_dec_NN(sv); } @@ -2440,7 +2465,7 @@ Perl_multideref_stringify(pTHX_ const OP *o, CV *cv) } } else - Perl_sv_catpvf(aTHX_ out, "%"IVdf, (++items)->iv); + Perl_sv_catpvf(aTHX_ out, "%" IVdf, (++items)->iv); break; case MDEREF_INDEX_padsv: S_append_padvar(aTHX_ (++items)->pad_offset, cv, out, 1, 0, 1); @@ -2527,7 +2552,7 @@ Perl_debop(pTHX_ const OP *o) break; case OP_MULTIDEREF: - PerlIO_printf(Perl_debug_log, "(%"SVf")", + PerlIO_printf(Perl_debug_log, "(%" SVf ")", SVfARG(multideref_stringify(o, deb_curcv(cxstack_ix)))); break; @@ -2569,7 +2594,7 @@ Perl_watch(pTHX_ char **addr) PL_watchaddr = addr; PL_watchok = *addr; - PerlIO_printf(Perl_debug_log, "WATCHING, %"UVxf" is currently %"UVxf"\n", + PerlIO_printf(Perl_debug_log, "WATCHING, %" UVxf " is currently %" UVxf "\n", PTR2UV(PL_watchaddr), PTR2UV(PL_watchok)); } diff --git a/ext/B/B.pm b/ext/B/B.pm index 5cc253e..e0f9e21 100644 --- a/ext/B/B.pm +++ b/ext/B/B.pm @@ -15,7 +15,7 @@ require Exporter; # walkoptree comes from B.xs BEGIN { - $B::VERSION = '1.64'; + $B::VERSION = '1.65'; @B::EXPORT_OK = (); # Our BOOT code needs $VERSION set, and will append to @EXPORT_OK. diff --git a/ext/B/B.xs b/ext/B/B.xs index 0352901..2279f36 100644 --- a/ext/B/B.xs +++ b/ext/B/B.xs @@ -923,7 +923,7 @@ hash(sv) U32 hash = 0; const char *s = SvPVbyte(sv, len); PERL_HASH(hash, s, len); - ST(0) = sv_2mortal(Perl_newSVpvf(aTHX_ "0x%"UVxf, (UV)hash)); + ST(0) = sv_2mortal(Perl_newSVpvf(aTHX_ "0x%" UVxf, (UV)hash)); #define cast_I32(foo) (I32)foo IV @@ -1337,12 +1337,12 @@ string(o, cv) break; case OP_ARGELEM: - ret = sv_2mortal(Perl_newSVpvf(aTHX_ "%"IVdf, + ret = sv_2mortal(Perl_newSVpvf(aTHX_ "%" IVdf, PTR2IV(aux))); break; case OP_ARGCHECK: - ret = Perl_newSVpvf(aTHX_ "%"IVdf",%"IVdf, aux[0].iv, aux[1].iv); + ret = Perl_newSVpvf(aTHX_ "%" IVdf ",%" IVdf, aux[0].iv, aux[1].iv); if (aux[2].iv) Perl_sv_catpvf(aTHX_ ret, ",%c", (char)aux[2].iv); ret = sv_2mortal(ret); diff --git a/ext/Devel-Peek/Peek.xs b/ext/Devel-Peek/Peek.xs index 2d9895b..cde3e51 100644 --- a/ext/Devel-Peek/Peek.xs +++ b/ext/Devel-Peek/Peek.xs @@ -461,7 +461,7 @@ PPCODE: PL_dumpindent = 2; for (i=1; i<items; i++) { - PerlIO_printf(Perl_debug_log, "Elt No. %ld 0x%"UVxf"\n", i - 1, PTR2UV(ST(i))); + PerlIO_printf(Perl_debug_log, "Elt No. %ld 0x%" UVxf "\n", i - 1, PTR2UV(ST(i))); do_sv_dump(0, Perl_debug_log, ST(i), 0, lim, (bool)(dumpop && SvTRUE(dumpop)), pv_lim); } diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL index aeba743..ee348c8 100644 --- a/ext/DynaLoader/DynaLoader_pm.PL +++ b/ext/DynaLoader/DynaLoader_pm.PL @@ -85,7 +85,7 @@ package DynaLoader; # [email protected], August 1994 BEGIN { - $VERSION = '1.39'; + $VERSION = '1.40'; } EOT diff --git a/ext/DynaLoader/dl_dlopen.xs b/ext/DynaLoader/dl_dlopen.xs index c166882..c9d164c 100644 --- a/ext/DynaLoader/dl_dlopen.xs +++ b/ext/DynaLoader/dl_dlopen.xs @@ -255,7 +255,7 @@ dl_install_xsub(perl_name, symref, filename="$Package") void * symref const char * filename CODE: - DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%"UVxf")\n", + DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%" UVxf ")\n", perl_name, PTR2UV(symref))); ST(0) = sv_2mortal(newRV((SV*)newXS_flags(perl_name, DPTR2FPTR(XSUBADDR_t, symref), diff --git a/ext/Hash-Util/Util.xs b/ext/Hash-Util/Util.xs index f419c6d..095a78c 100644 --- a/ext/Hash-Util/Util.xs +++ b/ext/Hash-Util/Util.xs @@ -95,7 +95,8 @@ hash_value(string,...) U8 *seedbuf= (U8 *)SvPV(ST(1),seedlen); if ( seedlen < PERL_HASH_SEED_BYTES ) { sv_dump(ST(1)); - Perl_croak(aTHX_ "seed len must be at least %d long only got %"UVuf" bytes", PERL_HASH_SEED_BYTES, (UV)seedlen); + Perl_croak(aTHX_ "seed len must be at least %d long only got %" + UVuf " bytes", PERL_HASH_SEED_BYTES, (UV)seedlen); } PERL_HASH_WITH_SEED(seedbuf, uv, pv, len); diff --git a/ext/Hash-Util/lib/Hash/Util.pm b/ext/Hash-Util/lib/Hash/Util.pm index 6dbc707..1a9e9ac 100644 --- a/ext/Hash-Util/lib/Hash/Util.pm +++ b/ext/Hash-Util/lib/Hash/Util.pm @@ -42,7 +42,7 @@ our @EXPORT_OK = qw( BEGIN { # make sure all our XS routines are available early so their prototypes # are correctly applied in the following code. - our $VERSION = '0.21'; + our $VERSION = '0.22'; require XSLoader; XSLoader::load(); } diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index a9da973..5c7d81a 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -1214,7 +1214,7 @@ static void S_setpayload(NV* nvp, NV_PAYLOAD_TYPE payload, bool signaling) { NV t1 = c99_trunc(payload); /* towards zero (drop fractional) */ #ifdef NV_PAYLOAD_DEBUG - Perl_warn(aTHX_ "t1 = %"NVgf" (payload %"NVgf")\n", t1, payload); + Perl_warn(aTHX_ "t1 = %" NVgf " (payload %" NVgf ")\n", t1, payload); #endif if (t1 <= UV_MAX) { a[0] = (UV)t1; /* Fast path, also avoids rounding errors (right?) */ @@ -1244,7 +1244,7 @@ static void S_setpayload(NV* nvp, NV_PAYLOAD_TYPE payload, bool signaling) #endif #ifdef NV_PAYLOAD_DEBUG for (i = 0; i < (int)C_ARRAY_LENGTH(a); i++) { - Perl_warn(aTHX_ "a[%d] = 0x%"UVxf"\n", i, a[i]); + Perl_warn(aTHX_ "a[%d] = 0x%" UVxf "\n", i, a[i]); } #endif for (i = 0; i < (int)sizeof(p); i++) { @@ -1255,7 +1255,9 @@ static void S_setpayload(NV* nvp, NV_PAYLOAD_TYPE payload, bool signaling) ((U8 *)(nvp))[i] &= ~m[i]; /* For NaNs with non-zero payload bits. */ ((U8 *)(nvp))[i] |= b; #ifdef NV_PAYLOAD_DEBUG - Perl_warn(aTHX_ "set p[%2d] = %02x (i = %d, m = %02x, s = %2d, b = %02x, u = %08"UVxf")\n", i, ((U8 *)(nvp))[i], i, m[i], s, b, u); + Perl_warn(aTHX_ + "set p[%2d] = %02x (i = %d, m = %02x, s = %2d, b = %02x, u = %08" + UVxf ")\n", i, ((U8 *)(nvp))[i], i, m[i], s, b, u); #endif a[p[i] / UVSIZE] &= ~u; } @@ -1272,7 +1274,7 @@ static void S_setpayload(NV* nvp, NV_PAYLOAD_TYPE payload, bool signaling) #endif for (i = 0; i < (int)C_ARRAY_LENGTH(a); i++) { if (a[i]) { - Perl_warn(aTHX_ "payload lost bits (%"UVxf")", a[i]); + Perl_warn(aTHX_ "payload lost bits (%" UVxf ")", a[i]); break; } } @@ -1303,7 +1305,7 @@ static NV_PAYLOAD_TYPE S_getpayload(NV nv) } for (i = (int)C_ARRAY_LENGTH(a) - 1; i >= 0; i--) { #ifdef NV_PAYLOAD_DEBUG - Perl_warn(aTHX_ "a[%d] = %"UVxf"\n", i, a[i]); + Perl_warn(aTHX_ "a[%d] = %" UVxf "\n", i, a[i]); #endif payload *= UV_MAX; payload += a[i]; diff --git a/ext/XS-APItest/APItest.xs b/ext/XS-APItest/APItest.xs index bb22e6c..c58e248 100644 --- a/ext/XS-APItest/APItest.xs +++ b/ext/XS-APItest/APItest.xs @@ -1258,8 +1258,8 @@ static void peep_xop(pTHX_ OP *o, OP *oldop) { dMY_CXT; - av_push(MY_CXT.xop_record, newSVpvf("peep:%"UVxf, PTR2UV(o))); - av_push(MY_CXT.xop_record, newSVpvf("oldop:%"UVxf, PTR2UV(oldop))); + av_push(MY_CXT.xop_record, newSVpvf("peep:%" UVxf, PTR2UV(o))); + av_push(MY_CXT.xop_record, newSVpvf("oldop:%" UVxf, PTR2UV(oldop))); } static I32 @@ -1849,7 +1849,7 @@ refcounted_he_exists(key, level=0) IV level CODE: if (level) { - croak("level must be zero, not %"IVdf, level); + croak("level must be zero, not %" IVdf, level); } RETVAL = (cop_hints_fetch_sv(PL_curcop, key, 0, 0) != &PL_sv_placeholder); OUTPUT: @@ -1861,7 +1861,7 @@ refcounted_he_fetch(key, level=0) IV level CODE: if (level) { - croak("level must be zero, not %"IVdf, level); + croak("level must be zero, not %" IVdf, level); } RETVAL = cop_hints_fetch_sv(PL_curcop, key, 0, 0); SvREFCNT_inc(RETVAL); @@ -2069,8 +2069,8 @@ xop_build_optree () unop->op_next = NULL; kid->op_next = (OP*)unop; - av_push(MY_CXT.xop_record, newSVpvf("unop:%"UVxf, PTR2UV(unop))); - av_push(MY_CXT.xop_record, newSVpvf("kid:%"UVxf, PTR2UV(kid))); + av_push(MY_CXT.xop_record, newSVpvf("unop:%" UVxf, PTR2UV(unop))); + av_push(MY_CXT.xop_record, newSVpvf("kid:%" UVxf, PTR2UV(kid))); av_push(MY_CXT.xop_record, newSVpvf("NAME:%s", OP_NAME((OP*)unop))); av_push(MY_CXT.xop_record, newSVpvf("DESC:%s", OP_DESC((OP*)unop))); @@ -4128,7 +4128,7 @@ lexical_import(SV *name, CV *cv) SAVESPTR(PL_comppad_name); PL_comppad_name = PadlistNAMES(pl); SAVESPTR(PL_comppad); PL_comppad = PadlistARRAY(pl)[1]; SAVESPTR(PL_curpad); PL_curpad = PadARRAY(PL_comppad); - off = pad_add_name_sv(sv_2mortal(newSVpvf("&%"SVf,name)), + off = pad_add_name_sv(sv_2mortal(newSVpvf("&%" SVf,name)), padadd_STATE, 0, 0); SvREFCNT_dec(PL_curpad[off]); PL_curpad[off] = SvREFCNT_inc(cv); @@ -4235,7 +4235,8 @@ CODE: } else if (items == 3) { Perl_load_module(aTHX_ flags, SvREFCNT_inc(name), SvREFCNT_inc(ST(2))); } else - Perl_croak(aTHX_ "load_module can't yet support %"IVdf" items", (IV)items); + Perl_croak(aTHX_ "load_module can't yet support %" IVdf " items", + (IV)items); SV * string_without_null(SV *sv) diff --git a/ext/XS-APItest/core_or_not.inc b/ext/XS-APItest/core_or_not.inc index 412074a..074fe60 100644 --- a/ext/XS-APItest/core_or_not.inc +++ b/ext/XS-APItest/core_or_not.inc @@ -19,7 +19,7 @@ CAT2(sv_setsv_cow_hashkey_, SUFFIX) () { if(!SvIsCOW(source)) { SvREFCNT_dec(source); Perl_croak(aTHX_ "Creating a shared hash key scalar failed when " - STRINGIFY(SUFFIX) " got flags %"UVxf, (UV)SvFLAGS(source)); + STRINGIFY(SUFFIX) " got flags %" UVxf, (UV)SvFLAGS(source)); } sv_setsv(destination, source); diff --git a/ext/XS-Typemap/Typemap.pm b/ext/XS-Typemap/Typemap.pm index a1ae021..7877b4a 100644 --- a/ext/XS-Typemap/Typemap.pm +++ b/ext/XS-Typemap/Typemap.pm @@ -36,7 +36,7 @@ require XSLoader; use vars qw/ $VERSION @EXPORT /; -$VERSION = '0.14'; +$VERSION = '0.15'; @EXPORT = (qw/ T_SV diff --git a/ext/XS-Typemap/Typemap.xs b/ext/XS-Typemap/Typemap.xs index 8314cc2..16731b1 100644 --- a/ext/XS-Typemap/Typemap.xs +++ b/ext/XS-Typemap/Typemap.xs @@ -176,7 +176,8 @@ XS_unpack_anotherstructPtrPtr(SV *in) if (SvROK(tmp) && SvTYPE(SvRV(tmp)) == SVt_PVHV) inhash = (HV*)SvRV(tmp); else - Perl_croak(aTHX_ "Array element %"UVuf" is not a HASH reference", i); + Perl_croak(aTHX_ "Array element %" UVuf + " is not a HASH reference", i); elem = hv_fetchs(inhash, "a", 0); if (elem == NULL) diff --git a/ext/mro/mro.pm b/ext/mro/mro.pm index 5df944c..92e8ca3 100644 --- a/ext/mro/mro.pm +++ b/ext/mro/mro.pm @@ -12,7 +12,7 @@ use warnings; # mro.pm versions < 1.00 reserved for MRO::Compat # for partial back-compat to 5.[68].x -our $VERSION = '1.19'; +our $VERSION = '1.20'; sub import { mro::set_mro(scalar(caller), $_[1]) if $_[1]; diff --git a/ext/mro/mro.xs b/ext/mro/mro.xs index f51d54a..80bce9a 100644 --- a/ext/mro/mro.xs +++ b/ext/mro/mro.xs @@ -45,7 +45,7 @@ S_mro_get_linear_isa_c3(pTHX_ HV* stash, U32 level) Perl_croak(aTHX_ "Can't linearize anonymous symbol table"); if (level > 100) - Perl_croak(aTHX_ "Recursive inheritance detected in package '%"HEKf + Perl_croak(aTHX_ "Recursive inheritance detected in package '%" HEKf "'", HEKfARG(stashhek)); @@ -256,21 +256,21 @@ S_mro_get_linear_isa_c3(pTHX_ HV* stash, U32 level) I32 i; errmsg = newSVpvf( - "Inconsistent hierarchy during C3 merge of class '%"HEKf"':\n\t" + "Inconsistent hierarchy during C3 merge of class '%" HEKf "':\n\t" "current merge results [\n", HEKfARG(stashhek)); for (i = 0; i <= av_tindex(retval); i++) { SV **elem = av_fetch(retval, i, 0); - sv_catpvf(errmsg, "\t\t%"SVf",\n", SVfARG(*elem)); + sv_catpvf(errmsg, "\t\t%" SVf ",\n", SVfARG(*elem)); } - sv_catpvf(errmsg, "\t]\n\tmerging failed on '%"SVf"'", SVfARG(cand)); + sv_catpvf(errmsg, "\t]\n\tmerging failed on '%" SVf "'", SVfARG(cand)); /* we have to do some cleanup before we croak */ SvREFCNT_dec(retval); Safefree(heads); - Perl_croak(aTHX_ "%"SVf, SVfARG(errmsg)); + Perl_croak(aTHX_ "%" SVf, SVfARG(errmsg)); } } } @@ -330,7 +330,7 @@ mro_get_linear_isa(...) else if(items > 1) { const struct mro_alg *const algo = Perl_mro_get_from_name(aTHX_ ST(1)); if (!algo) - Perl_croak(aTHX_ "Invalid mro name: '%"SVf"'", ST(1)); + Perl_croak(aTHX_ "Invalid mro name: '%" SVf "'", ST(1)); RETVAL = algo->resolve(aTHX_ class_stash, 0); } else { @@ -353,7 +353,7 @@ mro_set_mro(...) classname = ST(0); class_stash = gv_stashsv(classname, GV_ADD); - if(!class_stash) Perl_croak(aTHX_ "Cannot create class: '%"SVf"'!", SVfARG(classname)); + if(!class_stash) Perl_croak(aTHX_ "Cannot create class: '%" SVf "'!", SVfARG(classname)); meta = HvMROMETA(class_stash); Perl_mro_set_mro(aTHX_ meta, ST(1)); @@ -590,7 +590,7 @@ mro__nextcan(...) if(val == &PL_sv_undef) { if(throw_nomethod) Perl_croak(aTHX_ - "No next::method '%"SVf"' found for %"HEKf, + "No next::method '%" SVf "' found for %" HEKf, SVfARG(newSVpvn_flags(subname, subname_len, SVs_TEMP | ( subname_utf8 ? SVf_UTF8 : 0 ) )), HEKfARG( HvNAME_HEK(selfstash) )); @@ -638,7 +638,7 @@ mro__nextcan(...) if (!curstash) { if (ckWARN(WARN_SYNTAX)) Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "Can't locate package %"SVf" for @%"HEKf"::ISA", + "Can't locate package %" SVf " for @%" HEKf "::ISA", (void*)linear_sv, HEKfARG( HvNAME_HEK(selfstash) )); continue; @@ -671,7 +671,7 @@ mro__nextcan(...) (void)hv_store_ent(nmcache, sv, &PL_sv_undef, 0); if(throw_nomethod) - Perl_croak(aTHX_ "No next::method '%"SVf"' found for %"HEKf, + Perl_croak(aTHX_ "No next::method '%" SVf "' found for %" HEKf, SVfARG(newSVpvn_flags(subname, subname_len, SVs_TEMP | ( subname_utf8 ? SVf_UTF8 : 0 ) )), HEKfARG( HvNAME_HEK(selfstash) )); diff --git a/gv.c b/gv.c index d8cb79d..775951b 100644 --- a/gv.c +++ b/gv.c @@ -785,7 +785,7 @@ S_gv_fetchmeth_internal(pTHX_ HV* stash, SV* meth, const char* name, STRLEN len, if (!cstash) { Perl_ck_warner(aTHX_ packWARN(WARN_SYNTAX), - "Can't locate package %"SVf" for @%"HEKf"::ISA", + "Can't locate package %" SVf " for @%" HEKf "::ISA", SVfARG(linear_sv), HEKfARG(HvNAME_HEK(stash))); continue; @@ -1105,8 +1105,8 @@ Perl_gv_fetchmethod_pvn_flags(pTHX_ HV *stash, const char *name, const STRLEN le return gv; } Perl_croak(aTHX_ - "Can't locate object method \"%"UTF8f - "\" via package \"%"HEKf"\"", + "Can't locate object method \"%" UTF8f + "\" via package \"%" HEKf "\"", UTF8fARG(is_utf8, name_end - name, name), HEKfARG(HvNAME_HEK(stash))); } @@ -1121,9 +1121,9 @@ Perl_gv_fetchmethod_pvn_flags(pTHX_ HV *stash, const char *name, const STRLEN le } Perl_croak(aTHX_ - "Can't locate object method \"%"UTF8f - "\" via package \"%"SVf"\"" - " (perhaps you forgot to load \"%"SVf"\"?)", + "Can't locate object method \"%" UTF8f + "\" via package \"%" SVf "\"" + " (perhaps you forgot to load \"%" SVf "\"?)", UTF8fARG(is_utf8, name_end - name, name), SVfARG(packnamesv), SVfARG(packnamesv)); } @@ -1216,8 +1216,8 @@ Perl_gv_autoload_pvn(pTHX_ HV *stash, const char *name, STRLEN len, U32 flags) && (GvCVGEN(gv) || GvSTASH(gv) != stash) ) Perl_ck_warner_d(aTHX_ packWARN(WARN_DEPRECATED), - "Use of inherited AUTOLOAD for non-method %"SVf - "::%"UTF8f"() is deprecated", + "Use of inherited AUTOLOAD for non-method %" SVf + "::%" UTF8f "() is deprecated", SVfARG(packname), UTF8fARG(is_utf8, len, name)); @@ -1766,14 +1766,14 @@ S_find_default_stash(pTHX_ HV **stash, const char *name, STRLEN len, /* diag_listed_as: Variable "%s" is not imported%s */ Perl_ck_warner_d( aTHX_ packWARN(WARN_MISC), - "Variable \"%c%"UTF8f"\" is not imported", + "Variable \"%c%" UTF8f "\" is not imported", sv_type == SVt_PVAV ? '@' : sv_type == SVt_PVHV ? '%' : '$', UTF8fARG(is_utf8, len, name)); if (GvCVu(*gvp)) Perl_ck_warner_d( aTHX_ packWARN(WARN_MISC), - "\t(Did you mean &%"UTF8f" instead?)\n", + "\t(Did you mean &%" UTF8f " instead?)\n", UTF8fARG(is_utf8, len, name) ); *stash = NULL; @@ -1790,9 +1790,9 @@ S_find_default_stash(pTHX_ HV **stash, const char *name, STRLEN len, if (add && !PL_in_clean_all) { GV *gv; qerror(Perl_mess(aTHX_ - "Global symbol \"%s%"UTF8f + "Global symbol \"%s%" UTF8f "\" requires explicit package name (did you forget to " - "declare \"my %s%"UTF8f"\"?)", + "declare \"my %s%" UTF8f "\"?)", (sv_type == SVt_PV ? "$" : sv_type == SVt_PVAV ? "@" : sv_type == SVt_PVHV ? "%" @@ -2396,7 +2396,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags, if (add & GV_ADDWARN) Perl_ck_warner_d(aTHX_ packWARN(WARN_INTERNAL), - "Had to create %"UTF8f" unexpectedly", + "Had to create %" UTF8f " unexpectedly", UTF8fARG(is_utf8, name_end-nambeg, nambeg)); gv_init_pvn(gv, stash, name, len, (add & GV_ADDMULTI)|is_utf8); @@ -2507,7 +2507,7 @@ Perl_gv_check(pTHX_ HV *stash) = gv_fetchfile_flags(file, HEK_LEN(GvFILE_HEK(gv)), 0); #endif Perl_warner(aTHX_ packWARN(WARN_ONCE), - "Name \"%"HEKf"::%"HEKf + "Name \"%" HEKf "::%" HEKf "\" used only once: possible typo", HEKfARG(HvNAME_HEK(stash)), HEKfARG(GvNAME_HEK(gv))); @@ -2523,7 +2523,7 @@ Perl_newGVgen_flags(pTHX_ const char *pack, U32 flags) PERL_ARGS_ASSERT_NEWGVGEN_FLAGS; assert(!(flags & ~SVf_UTF8)); - return gv_fetchpv(Perl_form(aTHX_ "%"UTF8f"::_GEN_%ld", + return gv_fetchpv(Perl_form(aTHX_ "%" UTF8f "::_GEN_%ld", UTF8fARG(flags, strlen(pack), pack), (long)PL_gensym++), GV_ADD, SVt_PVGV); @@ -2603,7 +2603,7 @@ Perl_gp_free(pTHX_ GV *gv) const HEK *hvname_hek = HvNAME_HEK(hv); if (PL_stashcache && hvname_hek) { DEBUG_o(Perl_deb(aTHX_ - "gp_free clearing PL_stashcache for '%"HEKf"'\n", + "gp_free clearing PL_stashcache for '%" HEKf "'\n", HEKfARG(hvname_hek))); (void)hv_deletehek(PL_stashcache, hvname_hek, G_DISCARD); } @@ -2772,7 +2772,7 @@ Perl_Gv_AMupdate(pTHX_ HV *stash, bool destructing) GV *ngv = NULL; SV *gvsv = GvSV(gv); - DEBUG_o( Perl_deb(aTHX_ "Resolving method \"%"SVf256\ + DEBUG_o( Perl_deb(aTHX_ "Resolving method \"%" SVf256\ "\" for overloaded \"%s\" in package \"%.256s\"\n", (void*)GvSV(gv), cp, HvNAME(stash)) ); if (!gvsv || !SvPOK(gvsv) @@ -2787,9 +2787,9 @@ Perl_Gv_AMupdate(pTHX_ HV *stash, bool destructing) ? gvsv : newSVpvs_flags("???", SVs_TEMP); /* diag_listed_as: Can't resolve method "%s" overloading "%s" in package "%s" */ - Perl_croak(aTHX_ "%s method \"%"SVf256 + Perl_croak(aTHX_ "%s method \"%" SVf256 "\" overloading \"%s\" "\ - "in package \"%"HEKf256"\"", + "in package \"%" HEKf256 "\"", (GvCVGEN(gv) ? "Stub found while resolving" : "Can't resolve"), SVfARG(name), cp, @@ -3275,7 +3275,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags) SV *msg; if (off==-1) off=method; msg = sv_2mortal(Perl_newSVpvf(aTHX_ - "Operation \"%s\": no method found,%sargument %s%"SVf"%s%"SVf, + "Operation \"%s\": no method found,%sargument %s%" SVf "%s%" SVf, AMG_id2name(method + assignshift), (flags & AMGf_unary ? " " : "\n\tleft "), SvAMAGIC(left)? @@ -3293,9 +3293,9 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags) SVfARG(sv_2mortal(newSVhek(HvNAME_HEK(SvSTASH(SvRV(right)))))): SVfARG(&PL_sv_no))); if (use_default_op) { - DEBUG_o( Perl_deb(aTHX_ "%"SVf, SVfARG(msg)) ); + DEBUG_o( Perl_deb(aTHX_ "%" SVf, SVfARG(msg)) ); } else { - Perl_croak(aTHX_ "%"SVf, SVfARG(msg)); + Perl_croak(aTHX_ "%" SVf, SVfARG(msg)); } return NULL; } @@ -3366,7 +3366,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags) #ifdef DEBUGGING if (!notfound) { DEBUG_o(Perl_deb(aTHX_ - "Overloaded operator \"%s\"%s%s%s:\n\tmethod%s found%s in package %"SVf"%s\n", + "Overloaded operator \"%s\"%s%s%s:\n\tmethod%s found%s in package %" SVf "%s\n", AMG_id2name(off), method+assignshift==off? "" : " (initially \"", @@ -3553,7 +3553,7 @@ Perl_gv_name_set(pTHX_ GV *gv, const char *name, U32 len, U32 flags) PERL_ARGS_ASSERT_GV_NAME_SET; if (len > I32_MAX) - Perl_croak(aTHX_ "panic: gv name too long (%"UVuf")", (UV) len); + Perl_croak(aTHX_ "panic: gv name too long (%" UVuf ")", (UV) len); if (!(flags & GV_ADD) && GvNAME_HEK(gv)) { unshare_hek(GvNAME_HEK(gv)); diff --git a/hv.c b/hv.c index 7659a6d..c2646ca 100644 --- a/hv.c +++ b/hv.c @@ -766,7 +766,7 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, if (!entry && SvREADONLY(hv) && !(action & HV_FETCH_ISEXISTS)) { hv_notallowed(flags, key, klen, - "Attempt to access disallowed key '%"SVf"' in" + "Attempt to access disallowed key '%" SVf "' in" " a restricted hash"); } if (!(action & (HV_FETCH_LVALUE|HV_FETCH_ISSTORE))) { @@ -1168,7 +1168,7 @@ S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, } if (SvREADONLY(hv) && HeVAL(entry) && SvREADONLY(HeVAL(entry))) { hv_notallowed(k_flags, key, klen, - "Attempt to delete readonly key '%"SVf"' from" + "Attempt to delete readonly key '%" SVf "' from" " a restricted hash"); } if (k_flags & HVhek_FREEKEY) @@ -1317,7 +1317,7 @@ S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, not_found: if (SvREADONLY(hv)) { hv_notallowed(k_flags, key, klen, - "Attempt to delete disallowed key '%"SVf"' from" + "Attempt to delete disallowed key '%" SVf "' from" " a restricted hash"); } @@ -1723,7 +1723,7 @@ Perl_hv_clear(pTHX_ HV *hv) if (SvREADONLY(HeVAL(entry))) { SV* const keysv = hv_iterkeysv(entry); Perl_croak_nocontext( - "Attempt to delete readonly key '%"SVf"' from a restricted hash", + "Attempt to delete readonly key '%" SVf "' from a restricted hash", (void*)keysv); } SvREFCNT_dec_NN(HeVAL(entry)); @@ -1957,7 +1957,7 @@ Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags) if (PL_phase != PERL_PHASE_DESTRUCT && HvNAME(hv)) { if (PL_stashcache) { DEBUG_o(Perl_deb(aTHX_ "hv_undef_flags clearing PL_stashcache for '%" - HEKf"'\n", HEKfARG(HvNAME_HEK(hv)))); + HEKf "'\n", HEKfARG(HvNAME_HEK(hv)))); (void)hv_deletehek(PL_stashcache, HvNAME_HEK(hv), G_DISCARD); } hv_name_set(hv, NULL, 0, 0); @@ -1978,7 +1978,7 @@ Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags) mro_isa_changed_in(hv); if (PL_stashcache) { DEBUG_o(Perl_deb(aTHX_ "hv_undef_flags clearing PL_stashcache for effective name '%" - HEKf"'\n", HEKfARG(HvENAME_HEK(hv)))); + HEKf "'\n", HEKfARG(HvENAME_HEK(hv)))); (void)hv_deletehek(PL_stashcache, HvENAME_HEK(hv), G_DISCARD); } } @@ -1989,7 +1989,7 @@ Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags) if (flags & HV_NAME_SETALL ? !!HvAUX(hv)->xhv_name_u.xhvnameu_name : !!name) { if (name && PL_stashcache) { DEBUG_o(Perl_deb(aTHX_ "hv_undef_flags clearing PL_stashcache for name '%" - HEKf"'\n", HEKfARG(HvNAME_HEK(hv)))); + HEKf "'\n", HEKfARG(HvNAME_HEK(hv)))); (void)hv_deletehek(PL_stashcache, HvNAME_HEK(hv), G_DISCARD); } hv_name_set(hv, NULL, 0, flags); @@ -2293,7 +2293,7 @@ Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags) PERL_ARGS_ASSERT_HV_NAME_SET; if (len > I32_MAX) - Perl_croak(aTHX_ "panic: hv name too long (%"UVuf")", (UV) len); + Perl_croak(aTHX_ "panic: hv name too long (%" UVuf ")", (UV) len); if (SvOOK(hv)) { iter = HvAUX(hv); @@ -2400,7 +2400,7 @@ Perl_hv_ename_add(pTHX_ HV *hv, const char *name, U32 len, U32 flags) PERL_ARGS_ASSERT_HV_ENAME_ADD; if (len > I32_MAX) - Perl_croak(aTHX_ "panic: hv name too long (%"UVuf")", (UV) len); + Perl_croak(aTHX_ "panic: hv name too long (%" UVuf ")", (UV) len); PERL_HASH(hash, name, len); @@ -2462,7 +2462,7 @@ Perl_hv_ename_delete(pTHX_ HV *hv, const char *name, U32 len, U32 flags) PERL_ARGS_ASSERT_HV_ENAME_DELETE; if (len > I32_MAX) - Perl_croak(aTHX_ "panic: hv name too long (%"UVuf")", (UV) len); + Perl_croak(aTHX_ "panic: hv name too long (%" UVuf ")", (UV) len); if (!SvOOK(hv)) return; @@ -3142,7 +3142,7 @@ S_refcounted_he_value(pTHX_ const struct refcounted_he *he) SvUTF8_on(value); break; default: - Perl_croak(aTHX_ "panic: refcounted_he_value bad flags %"UVxf, + Perl_croak(aTHX_ "panic: refcounted_he_value bad flags %" UVxf, (UV)he->refcounted_he_data[0]); } return value; @@ -3165,7 +3165,7 @@ Perl_refcounted_he_chain_2hv(pTHX_ const struct refcounted_he *chain, U32 flags) U32 placeholders, max; if (flags) - Perl_croak(aTHX_ "panic: refcounted_he_chain_2hv bad flags %"UVxf, + Perl_croak(aTHX_ "panic: refcounted_he_chain_2hv bad flags %" UVxf, (UV)flags); /* We could chase the chain once to get an idea of the number of keys, @@ -3279,7 +3279,7 @@ Perl_refcounted_he_fetch_pvn(pTHX_ const struct refcounted_he *chain, PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_PVN; if (flags & ~(REFCOUNTED_HE_KEY_UTF8|REFCOUNTED_HE_EXISTS)) - Perl_croak(aTHX_ "panic: refcounted_he_fetch_pvn bad flags %"UVxf, + Perl_croak(aTHX_ "panic: refcounted_he_fetch_pvn bad flags %" UVxf, (UV)flags); if (!chain) goto ret; @@ -3380,7 +3380,7 @@ Perl_refcounted_he_fetch_sv(pTHX_ const struct refcounted_he *chain, STRLEN keylen; PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_SV; if (flags & REFCOUNTED_HE_KEY_UTF8) - Perl_croak(aTHX_ "panic: refcounted_he_fetch_sv bad flags %"UVxf, + Perl_croak(aTHX_ "panic: refcounted_he_fetch_sv bad flags %" UVxf, (UV)flags); keypv = SvPV_const(key, keylen); if (SvUTF8(key)) @@ -3568,7 +3568,7 @@ Perl_refcounted_he_new_sv(pTHX_ struct refcounted_he *parent, STRLEN keylen; PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_SV; if (flags & REFCOUNTED_HE_KEY_UTF8) - Perl_croak(aTHX_ "panic: refcounted_he_new_sv bad flags %"UVxf, + Perl_croak(aTHX_ "panic: refcounted_he_new_sv bad flags %" UVxf, (UV)flags); keypv = SvPV_const(key, keylen); if (SvUTF8(key)) diff --git a/inline.h b/inline.h index 5d516da..346dcdc 100644 --- a/inline.h +++ b/inline.h @@ -131,7 +131,7 @@ PERL_STATIC_INLINE I32 S_TOPMARK(pTHX) { DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, - "MARK top %p %"IVdf"\n", + "MARK top %p %" IVdf "\n", PL_markstack_ptr, (IV)*PL_markstack_ptr))); return *PL_markstack_ptr; @@ -141,7 +141,7 @@ PERL_STATIC_INLINE I32 S_POPMARK(pTHX) { DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, - "MARK pop %p %"IVdf"\n", + "MARK pop %p %" IVdf "\n", (PL_markstack_ptr-1), (IV)*(PL_markstack_ptr-1)))); assert((PL_markstack_ptr > PL_markstack) || !"MARK underflow"); diff --git a/locale.c b/locale.c index c721eca..e0b6793 100644 --- a/locale.c +++ b/locale.c @@ -1947,7 +1947,7 @@ S_print_collxfrm_input_and_return(pTHX_ PerlIO_printf(Perl_debug_log, "_mem_collxfrm[%u]: returning ", PL_collation_ix); if (xlen) { - PerlIO_printf(Perl_debug_log, "%"UVuf"", (UV) *xlen); + PerlIO_printf(Perl_debug_log, "%" UVuf, (UV) *xlen); } else { PerlIO_printf(Perl_debug_log, "NULL"); @@ -1970,7 +1970,7 @@ S_print_collxfrm_input_and_return(pTHX_ if (! first_time) { PerlIO_printf(Perl_debug_log, " "); } - PerlIO_printf(Perl_debug_log, "%02"UVXf"", cp); + PerlIO_printf(Perl_debug_log, "%02" UVXf, cp); prev_was_printable = FALSE; } t += (is_utf8) ? UTF8SKIP(t) : 1; diff --git a/malloc.c b/malloc.c index 69b6b95..2f8dfa3 100644 --- a/malloc.c +++ b/malloc.c @@ -1015,7 +1015,9 @@ emergency_sbrk(MEM_SIZE size) /* Give the possibility to recover, but avoid an infinite cycle. */ MALLOC_UNLOCK; emergency_buffer_last_req = size; - emergency_sbrk_croak("Out of memory during \"large\" request for %"UVuf" bytes, total sbrk() is %"UVuf" bytes", (UV)size, (UV)(goodsbrk + sbrk_slack)); + emergency_sbrk_croak("Out of memory during \"large\" request for %" UVuf + " bytes, total sbrk() is %" UVuf " bytes", + (UV)size, (UV)(goodsbrk + sbrk_slack)); } if ((MEM_SIZE)emergency_buffer_size >= rsize) { @@ -1059,7 +1061,9 @@ emergency_sbrk(MEM_SIZE size) } do_croak: MALLOC_UNLOCK; - emergency_sbrk_croak("Out of memory during request for %"UVuf" bytes, total sbrk() is %"UVuf" bytes", (UV)size, (UV)(goodsbrk + sbrk_slack)); + emergency_sbrk_croak("Out of memory during request for %" UVuf + " bytes, total sbrk() is %" UVuf " bytes", + (UV)size, (UV)(goodsbrk + sbrk_slack)); NOT_REACHED; /* NOTREACHED */ return NULL; } @@ -1306,7 +1310,7 @@ Perl_malloc(size_t nbytes) || (p && PTR2UV(p) < (1<<LOG_OF_MIN_ARENA)) ) { dTHX; PerlIO_printf(PerlIO_stderr(), - "Unaligned pointer in the free chain 0x%"UVxf"\n", + "Unaligned pointer in the free chain 0x%" UVxf "\n", PTR2UV(p)); } if ( (PTR2UV(p->ov_next) & (MEM_ALIGNBYTES - 1)) @@ -1314,7 +1318,7 @@ Perl_malloc(size_t nbytes) dTHX; PerlIO_printf(PerlIO_stderr(), "Unaligned \"next\" pointer in the free " - "chain 0x%"UVxf" at 0x%"UVxf"\n", + "chain 0x%" UVxf " at 0x%" UVxf "\n", PTR2UV(p->ov_next), PTR2UV(p)); } #endif @@ -1323,7 +1327,7 @@ Perl_malloc(size_t nbytes) MALLOC_UNLOCK; DEBUG_m(PerlIO_printf(Perl_debug_log, - "0x%"UVxf": (%05lu) malloc %ld bytes\n", + "0x% "UVxf ": (%05lu) malloc %ld bytes\n", PTR2UV((Malloc_t)(p + CHUNK_SHIFT)), (unsigned long)(PL_an++), (long)size)); @@ -1803,7 +1807,7 @@ Perl_mfree(Malloc_t where) #endif DEBUG_m(PerlIO_printf(Perl_debug_log, - "0x%"UVxf": (%05lu) free\n", + "0x%" UVxf ": (%05lu) free\n", PTR2UV(cp), (unsigned long)(PL_an++))); if (cp == NULL) @@ -2030,7 +2034,7 @@ Perl_realloc(void *mp, size_t nbytes) #endif res = cp; DEBUG_m(PerlIO_printf(Perl_debug_log, - "0x%"UVxf": (%05lu) realloc %ld bytes inplace\n", + "0x%" UVxf ": (%05lu) realloc %ld bytes inplace\n", PTR2UV(res),(unsigned long)(PL_an++), (long)size)); } else if (incr == 1 && (cp - M_OVERHEAD == last_op) @@ -2068,7 +2072,7 @@ Perl_realloc(void *mp, size_t nbytes) } else { hard_way: DEBUG_m(PerlIO_printf(Perl_debug_log, - "0x%"UVxf": (%05lu) realloc %ld bytes the hard way\n", + "0x%" UVxf ": (%05lu) realloc %ld bytes the hard way\n", PTR2UV(cp),(unsigned long)(PL_an++), (long)size)); if ((res = (char*)Perl_malloc(nbytes)) == NULL) @@ -2242,13 +2246,14 @@ Perl_dump_mstats(pTHX_ const char *s) if (s) PerlIO_printf(Perl_error_log, - "Memory allocation statistics %s (buckets %"IVdf"(%"IVdf")..%"IVdf"(%"IVdf")\n", + "Memory allocation statistics %s (buckets %" IVdf + "(%" IVdf ")..%" IVdf "(%" IVdf ")\n", s, (IV)BUCKET_SIZE_REAL(MIN_BUCKET), (IV)BUCKET_SIZE_NO_SURPLUS(MIN_BUCKET), (IV)BUCKET_SIZE_REAL(buffer.topbucket), (IV)BUCKET_SIZE_NO_SURPLUS(buffer.topbucket)); - PerlIO_printf(Perl_error_log, "%8"IVdf" free:", buffer.totfree); + PerlIO_printf(Perl_error_log, "%8" IVdf " free:", buffer.totfree); for (i = MIN_EVEN_REPORT; i <= buffer.topbucket; i += BUCKETS_PER_POW2) { PerlIO_printf(Perl_error_log, ((i < 8*BUCKETS_PER_POW2 || i == 10*BUCKETS_PER_POW2) @@ -2266,7 +2271,8 @@ Perl_dump_mstats(pTHX_ const char *s) buffer.nfree[i]); } #endif - PerlIO_printf(Perl_error_log, "\n%8"IVdf" used:", buffer.total - buffer.totfree); + PerlIO_printf(Perl_error_log, "\n%8" IVdf " used:", + buffer.total - buffer.totfree); for (i = MIN_EVEN_REPORT; i <= buffer.topbucket; i += BUCKETS_PER_POW2) { PerlIO_printf(Perl_error_log, ((i < 8*BUCKETS_PER_POW2 || i == 10*BUCKETS_PER_POW2) @@ -2284,7 +2290,9 @@ Perl_dump_mstats(pTHX_ const char *s) buffer.ntotal[i] - buffer.nfree[i]); } #endif - PerlIO_printf(Perl_error_log, "\nTotal sbrk(): %"IVdf"/%"IVdf":%"IVdf". Odd ends: pad+heads+chain+tail: %"IVdf"+%"IVdf"+%"IVdf"+%"IVdf".\n", + PerlIO_printf(Perl_error_log, "\nTotal sbrk(): %" IVdf "/%" IVdf ":%" + IVdf ". Odd ends: pad+heads+chain+tail: %" IVdf "+%" + IVdf "+%" IVdf "+%" IVdf ".\n", buffer.total_sbrk, buffer.sbrks, buffer.sbrk_good, buffer.sbrk_slack, buffer.start_slack, buffer.total_chain, buffer.sbrked_remains); @@ -2357,8 +2365,10 @@ Perl_sbrk(int size) } } - DEBUG_m(PerlIO_printf(Perl_debug_log, "sbrk malloc size %ld (reqsize %ld), left size %ld, give addr 0x%"UVxf"\n", - size, reqsize, Perl_sbrk_oldsize, PTR2UV(got))); + DEBUG_m(PerlIO_printf(Perl_debug_log, + "sbrk malloc size %ld (reqsize %ld), left size %ld, give addr 0x%" + UVxf "\n", + size, reqsize, Perl_sbrk_oldsize, PTR2UV(got))); return (void *)got; } diff --git a/mg.c b/mg.c index d0d3b9d..b7ce69d 100644 --- a/mg.c +++ b/mg.c @@ -1127,7 +1127,7 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg) Newx(gary, num_groups, Groups_t); num_groups = getgroups(num_groups, gary); for (i = 0; i < num_groups; i++) - Perl_sv_catpvf(aTHX_ sv, " %"IVdf, (IV)gary[i]); + Perl_sv_catpvf(aTHX_ sv, " %" IVdf, (IV)gary[i]); Safefree(gary); } } @@ -2002,7 +2002,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'", + Perl_croak(aTHX_ "panic: magic_setdbline len=%" IVdf ", ptr='%s'", (IV)mg->mg_len, mg->mg_ptr); } @@ -3246,7 +3246,7 @@ Perl_sighandler(int sig) : cv && CvGV(cv) ? GvENAME_HEK(CvGV(cv)) : NULL; if (hek) Perl_ck_warner(aTHX_ packWARN(WARN_SIGNAL), - "SIG%s handler \"%"HEKf"\" not defined.\n", + "SIG%s handler \"%" HEKf "\" not defined.\n", PL_sig_name[sig], HEKfARG(hek)); /* diag_listed_as: SIG%s handler "%s" not defined */ else Perl_ck_warner(aTHX_ packWARN(WARN_SIGNAL), diff --git a/mro_core.c b/mro_core.c index 809bcdf..d1abc28 100644 --- a/mro_core.c +++ b/mro_core.c @@ -241,7 +241,7 @@ S_mro_get_linear_isa_dfs(pTHX_ HV *stash, U32 level) if (level > 100) Perl_croak(aTHX_ - "Recursive inheritance detected in package '%"HEKf"'", + "Recursive inheritance detected in package '%" HEKf "'", HEKfARG(stashhek)); meta = HvMROMETA(stash); @@ -954,7 +954,7 @@ S_mro_gather_and_rename(pTHX_ HV * const stashes, HV * const seen_stashes, STRLEN len; const char *name = SvPVx_const(*svp, len); if(PL_stashcache) { - DEBUG_o(Perl_deb(aTHX_ "mro_gather_and_rename clearing PL_stashcache for '%"SVf"'\n", + DEBUG_o(Perl_deb(aTHX_ "mro_gather_and_rename clearing PL_stashcache for '%" SVf "'\n", SVfARG(*svp))); (void)hv_delete(PL_stashcache, name, name_utf8 ? -(I32)len : (I32)len, G_DISCARD); } @@ -1369,7 +1369,7 @@ Perl_mro_set_mro(pTHX_ struct mro_meta *const meta, SV *const name) PERL_ARGS_ASSERT_MRO_SET_MRO; if (!which) - Perl_croak(aTHX_ "Invalid mro name: '%"SVf"'", name); + Perl_croak(aTHX_ "Invalid mro name: '%" SVf "'", name); if(meta->mro_which != which) { if (meta->mro_linear_current && !meta->mro_linear_all) { @@ -1415,7 +1415,7 @@ XS(XS_mro_method_changed_in) classname = ST(0); class_stash = gv_stashsv(classname, 0); - if(!class_stash) Perl_croak(aTHX_ "No such class: '%"SVf"'!", SVfARG(classname)); + if(!class_stash) Perl_croak(aTHX_ "No such class: '%" SVf "'!", SVfARG(classname)); mro_method_changed_in(class_stash); diff --git a/op.c b/op.c index 63a73ee..9724ff0 100644 --- a/op.c +++ b/op.c @@ -622,7 +622,7 @@ S_bad_type_gv(pTHX_ I32 n, GV *gv, const OP *kid, const char *t) SV * const namesv = cv_name((CV *)gv, NULL, 0); PERL_ARGS_ASSERT_BAD_TYPE_GV; - yyerror_pv(Perl_form(aTHX_ "Type of arg %d to %"SVf" must be %s (not %s)", + yyerror_pv(Perl_form(aTHX_ "Type of arg %d to %" SVf " must be %s (not %s)", (int)n, SVfARG(namesv), t, OP_DESC(kid)), SvUTF8(namesv)); } @@ -632,7 +632,7 @@ S_no_bareword_allowed(pTHX_ OP *o) PERL_ARGS_ASSERT_NO_BAREWORD_ALLOWED; qerror(Perl_mess(aTHX_ - "Bareword \"%"SVf"\" not allowed while \"strict subs\" in use", + "Bareword \"%" SVf "\" not allowed while \"strict subs\" in use", **** PATCH TRUNCATED AT 2000 LINES -- 4041 NOT SHOWN **** -- Perl5 Master Repository
