diff options
| -rw-r--r-- | av.c | 2 | ||||
| -rw-r--r-- | deb.c | 8 | ||||
| -rw-r--r-- | doio.c | 39 | ||||
| -rw-r--r-- | dump.c | 311 | ||||
| -rw-r--r-- | ext/B/B.pm | 2 | ||||
| -rw-r--r-- | ext/B/B.xs | 6 | ||||
| -rw-r--r-- | ext/Devel-Peek/Peek.xs | 2 | ||||
| -rw-r--r-- | ext/DynaLoader/DynaLoader_pm.PL | 2 | ||||
| -rw-r--r-- | ext/DynaLoader/dl_dlopen.xs | 2 | ||||
| -rw-r--r-- | ext/Hash-Util/Util.xs | 3 | ||||
| -rw-r--r-- | ext/Hash-Util/lib/Hash/Util.pm | 2 | ||||
| -rw-r--r-- | ext/POSIX/POSIX.xs | 12 | ||||
| -rw-r--r-- | ext/XS-APItest/APItest.xs | 17 | ||||
| -rw-r--r-- | ext/XS-APItest/core_or_not.inc | 2 | ||||
| -rw-r--r-- | ext/XS-Typemap/Typemap.pm | 2 | ||||
| -rw-r--r-- | ext/XS-Typemap/Typemap.xs | 3 | ||||
| -rw-r--r-- | ext/mro/mro.pm | 2 | ||||
| -rw-r--r-- | ext/mro/mro.xs | 20 | ||||
| -rw-r--r-- | gv.c | 48 | ||||
| -rw-r--r-- | hv.c | 30 | ||||
| -rw-r--r-- | inline.h | 4 | ||||
| -rw-r--r-- | locale.c | 4 | ||||
| -rw-r--r-- | malloc.c | 38 | ||||
| -rw-r--r-- | mg.c | 6 | ||||
| -rw-r--r-- | mro_core.c | 8 | ||||
| -rw-r--r-- | op.c | 78 | ||||
| -rw-r--r-- | pad.c | 58 | ||||
| -rw-r--r-- | perl.c | 16 | ||||
| -rw-r--r-- | perl.h | 6 | ||||
| -rw-r--r-- | perlio.c | 4 | ||||
| -rw-r--r-- | perly.c | 6 | ||||
| -rw-r--r-- | pp.c | 10 | ||||
| -rw-r--r-- | pp.h | 4 | ||||
| -rw-r--r-- | pp_ctl.c | 34 | ||||
| -rw-r--r-- | pp_hot.c | 28 | ||||
| -rw-r--r-- | pp_pack.c | 9 | ||||
| -rw-r--r-- | pp_sort.c | 2 | ||||
| -rw-r--r-- | pp_sys.c | 54 | ||||
| -rw-r--r-- | regcomp.c | 233 | ||||
| -rw-r--r-- | regexec.c | 109 | ||||
| -rw-r--r-- | scope.c | 50 | ||||
| -rw-r--r-- | sv.c | 96 | ||||
| -rw-r--r-- | taint.c | 4 | ||||
| -rw-r--r-- | toke.c | 77 | ||||
| -rw-r--r-- | universal.c | 10 | ||||
| -rw-r--r-- | utf8.c | 64 | ||||
| -rw-r--r-- | util.c | 56 |
47 files changed, 816 insertions, 767 deletions
@@ -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; @@ -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) */ @@ -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 { @@ -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 5cc253e12a..e0f9e21f0d 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 03529010ca..2279f36850 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 2d9895bd44..cde3e51dec 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 aeba743cb8..ee348c80ea 100644 --- a/ext/DynaLoader/DynaLoader_pm.PL +++ b/ext/DynaLoader/DynaLoader_pm.PL @@ -85,7 +85,7 @@ package DynaLoader; # Tim.Bunce@ig.co.uk, 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 c166882638..c9d164c766 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 f419c6d76e..095a78c6e6 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 6dbc707b4c..1a9e9ac810 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 a9da9730f0..5c7d81a045 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 bb22e6ca65..c58e248c89 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 412074a28f..074fe60d31 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 a1ae0211d2..7877b4a3ab 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 8314cc2b04..16731b1a01 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 5df944c583..92e8ca38cb 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 f51d54a1b5..80bce9a6ad 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) )); @@ -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)); @@ -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)) @@ -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"); @@ -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; @@ -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; } @@ -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 809bcdf514..d1abc28b72 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); @@ -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", SVfARG(cSVOPo_sv))); o->op_private &= ~OPpCONST_STRICT; /* prevent warning twice about the same OP */ } @@ -1726,15 +1726,15 @@ S_scalar_slice_warning(pTHX_ const OP *o) if (key) /* diag_listed_as: Scalar value @%s[%s] better written as $%s[%s] */ Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "Scalar value @%"SVf"%c%s%c better written as $%"SVf + "Scalar value @%" SVf "%c%s%c better written as $%" SVf "%c%s%c", SVfARG(name), lbrack, key, rbrack, SVfARG(name), lbrack, key, rbrack); else /* diag_listed_as: Scalar value @%s[%s] better written as $%s[%s] */ Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "Scalar value @%"SVf"%c%"SVf"%c better written as $%" - SVf"%c%"SVf"%c", + "Scalar value @%" SVf "%c%" SVf "%c better written as $%" + SVf "%c%" SVf "%c", SVfARG(name), lbrack, SVfARG(keysv), rbrack, SVfARG(name), lbrack, SVfARG(keysv), rbrack); } @@ -1839,15 +1839,15 @@ Perl_scalar(pTHX_ OP *o) if (key) /* diag_listed_as: %%s[%s] in scalar context better written as $%s[%s] */ Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "%%%"SVf"%c%s%c in scalar context better written " - "as $%"SVf"%c%s%c", + "%%%" SVf "%c%s%c in scalar context better written " + "as $%" SVf "%c%s%c", SVfARG(name), lbrack, key, rbrack, SVfARG(name), lbrack, key, rbrack); else /* diag_listed_as: %%s[%s] in scalar context better written as $%s[%s] */ Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "%%%"SVf"%c%"SVf"%c in scalar context better " - "written as $%"SVf"%c%"SVf"%c", + "%%%" SVf "%c%" SVf "%c in scalar context better " + "written as $%" SVf "%c%" SVf "%c", SVfARG(name), lbrack, SVfARG(keysv), rbrack, SVfARG(name), lbrack, SVfARG(keysv), rbrack); } @@ -2056,7 +2056,7 @@ Perl_scalarvoid(pTHX_ OP *arg) SvREFCNT_dec_NN(dsv); } else if (SvOK(sv)) { - useless_sv = Perl_newSVpvf(aTHX_ "a constant (%"SVf")", SVfARG(sv)); + useless_sv = Perl_newSVpvf(aTHX_ "a constant (%" SVf ")", SVfARG(sv)); } else useless = "a constant (undef)"; @@ -2210,7 +2210,7 @@ Perl_scalarvoid(pTHX_ OP *arg) if (useless_sv) { /* mortalise it, in case warnings are fatal. */ Perl_ck_warner(aTHX_ packWARN(WARN_VOID), - "Useless use of %"SVf" in void context", + "Useless use of %" SVf " in void context", SVfARG(sv_2mortal(useless_sv))); } else if (useless) { @@ -2438,8 +2438,8 @@ S_check_hash_fields_and_hekify(pTHX_ UNOP *rop, SVOP *key_op) if ( check_fields && !hv_fetch_ent(GvHV(*fields), *svp, FALSE, 0)) { - Perl_croak(aTHX_ "No such class field \"%"SVf"\" " - "in variable %"PNf" of type %"HEKf, + Perl_croak(aTHX_ "No such class field \"%" SVf "\" " + "in variable %" PNf " of type %" HEKf, SVfARG(*svp), PNfARG(lexname), HEKfARG(HvNAME_HEK(PadnameTYPE(lexname)))); } @@ -2532,7 +2532,7 @@ S_finalize_op(pTHX_ OP* o) SV * const sv = sv_newmortal(); gv_efullname3(sv, gv, NULL); Perl_warner(aTHX_ packWARN(WARN_PROTOTYPE), - "%"SVf"() called too early to check prototype", + "%" SVf "() called too early to check prototype", SVfARG(sv)); } } @@ -2904,7 +2904,7 @@ Perl_op_lvalue_flags(pTHX_ OP *o, I32 type, U32 flags) if (kid->op_type != OP_NULL || kid->op_targ != OP_LIST) Perl_croak(aTHX_ "panic: unexpected lvalue entersub " - "args: type/targ %ld:%"UVuf, + "args: type/targ %ld:%" UVuf, (long)kid->op_type, (UV)kid->op_targ); kid = kLISTOP->op_first; } @@ -2920,7 +2920,7 @@ Perl_op_lvalue_flags(pTHX_ OP *o, I32 type, U32 flags) if (kid->op_type == OP_NULL) Perl_croak(aTHX_ "Unexpected constant lvalue entersub " - "entry via type/targ %ld:%"UVuf, + "entry via type/targ %ld:%" UVuf, (long)kid->op_type, (UV)kid->op_targ); if (kid->op_type != OP_GV) { break; @@ -2941,7 +2941,7 @@ Perl_op_lvalue_flags(pTHX_ OP *o, I32 type, U32 flags) namesv = cv_name(cv, NULL, 0); yyerror_pv(Perl_form(aTHX_ "Can't modify non-lvalue " - "subroutine call of &%"SVf" in %s", + "subroutine call of &%" SVf " in %s", SVfARG(namesv), PL_op_desc[type]), SvUTF8(namesv)); return o; @@ -3094,7 +3094,7 @@ Perl_op_lvalue_flags(pTHX_ OP *o, I32 type, U32 flags) case OP_PADSV: PL_modcount++; if (!type) /* local() */ - Perl_croak(aTHX_ "Can't localize lexical variable %"PNf, + Perl_croak(aTHX_ "Can't localize lexical variable %" PNf, PNfARG(PAD_COMPNAME(o->op_targ))); if (!(o->op_private & OPpLVAL_INTRO) || ( type != OP_SASSIGN && type != OP_AASSIGN @@ -3662,7 +3662,7 @@ S_move_proto_attr(pTHX_ OP **proto, OP **attrs, const GV * name) STRLEN new_len; const char * newp = SvPV(cSVOPo_sv, new_len); Perl_warner(aTHX_ packWARN(WARN_MISC), - "Attribute prototype(%"UTF8f") discards earlier prototype attribute in same sub", + "Attribute prototype(%" UTF8f ") discards earlier prototype attribute in same sub", UTF8fARG(SvUTF8(cSVOPo_sv), new_len, newp)); op_free(new_proto); } @@ -3703,8 +3703,8 @@ S_move_proto_attr(pTHX_ OP **proto, OP **attrs, const GV * name) const char * newp = SvPV(cSVOPx_sv(new_proto), new_len); Perl_warner(aTHX_ packWARN(WARN_PROTOTYPE), - "Prototype '%"UTF8f"' overridden by attribute 'prototype(%"UTF8f")'" - " in %"SVf, + "Prototype '%" UTF8f "' overridden by attribute 'prototype(%" UTF8f ")'" + " in %" SVf, UTF8fARG(SvUTF8(cSVOPx_sv(*proto)), old_len, oldp), UTF8fARG(SvUTF8(cSVOPx_sv(new_proto)), new_len, newp), SVfARG(svname)); @@ -3889,7 +3889,7 @@ Perl_bind_match(pTHX_ I32 type, OP *left, OP *right) S_op_varname(aTHX_ left); if (name) Perl_warner(aTHX_ packWARN(WARN_MISC), - "Applying %s to %"SVf" will act on scalar(%"SVf")", + "Applying %s to %" SVf " will act on scalar(%" SVf ")", desc, SVfARG(name), SVfARG(name)); else { const char * const sample = (isary @@ -7890,19 +7890,19 @@ Perl_cv_ckproto_len_flags(pTHX_ const CV *cv, const GV *gv, const char *p, } sv_setpvs(msg, "Prototype mismatch:"); if (name) - Perl_sv_catpvf(aTHX_ msg, " sub %"SVf, SVfARG(name)); + Perl_sv_catpvf(aTHX_ msg, " sub %" SVf, SVfARG(name)); if (cvp) - Perl_sv_catpvf(aTHX_ msg, " (%"UTF8f")", + Perl_sv_catpvf(aTHX_ msg, " (%" UTF8f ")", UTF8fARG(SvUTF8(cv),clen,cvp) ); else sv_catpvs(msg, ": none"); sv_catpvs(msg, " vs "); if (p) - Perl_sv_catpvf(aTHX_ msg, "(%"UTF8f")", UTF8fARG(flags & SVf_UTF8,len,p)); + Perl_sv_catpvf(aTHX_ msg, "(%" UTF8f ")", UTF8fARG(flags & SVf_UTF8,len,p)); else sv_catpvs(msg, "none"); - Perl_warner(aTHX_ packWARN(WARN_PROTOTYPE), "%"SVf, SVfARG(msg)); + Perl_warner(aTHX_ packWARN(WARN_PROTOTYPE), "%" SVf, SVfARG(msg)); } static void const_sv_xsub(pTHX_ CV* cv); @@ -8471,7 +8471,7 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, has_name = TRUE; } else if (PERLDB_NAMEANON && CopLINE(PL_curcop)) { SV * const sv = sv_newmortal(); - Perl_sv_setpvf(aTHX_ sv, "%s[%s:%"IVdf"]", + Perl_sv_setpvf(aTHX_ sv, "%s[%s:%" IVdf "]", PL_curstash ? "__ANON__" : "__ANON__::__ANON__", CopFILE(PL_curcop), (IV)CopLINE(PL_curcop)); gv = gv_fetchsv(sv, gv_fetch_flags, SVt_PVCV); @@ -8527,7 +8527,7 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, SV * const errsv = ERRSV; /* force display of errors found but not reported */ sv_catpvs(errsv, "BEGIN not safe after errors--compilation aborted"); - Perl_croak_nocontext("%"SVf, SVfARG(errsv)); + Perl_croak_nocontext("%" SVf, SVfARG(errsv)); } } } @@ -8626,7 +8626,7 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, || sv_cmp(SvRV(gv), const_sv) ))) { assert(cSVOPo); Perl_warner(aTHX_ packWARN(WARN_REDEFINE), - "Constant subroutine %"SVf" redefined", + "Constant subroutine %" SVf " redefined", SVfARG(cSVOPo->op_sv)); } @@ -9256,7 +9256,7 @@ Perl_newFORM(pTHX_ I32 floor, OP *o, OP *block) CopLINE_set(PL_curcop, PL_parser->copline); if (o) { Perl_warner(aTHX_ packWARN(WARN_REDEFINE), - "Format %"SVf" redefined", SVfARG(cSVOPo->op_sv)); + "Format %" SVf " redefined", SVfARG(cSVOPo->op_sv)); } else { /* diag_listed_as: Format %s redefined */ Perl_warner(aTHX_ packWARN(WARN_REDEFINE), @@ -9850,7 +9850,7 @@ Perl_ck_rvconst(pTHX_ OP *o) } if (badthing) Perl_croak(aTHX_ - "Can't use bareword (\"%"SVf"\") as %s ref while \"strict refs\" in use", + "Can't use bareword (\"%" SVf "\") as %s ref while \"strict refs\" in use", SVfARG(kidsv), badthing); } /* @@ -11247,7 +11247,7 @@ Perl_ck_join(pTHX_ OP *o) SVs_TEMP | ( RX_UTF8(re) ? SVf_UTF8 : 0 ) ) : newSVpvs_flags( "STRING", SVs_TEMP ); Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "/%"SVf"/ should probably be written as \"%"SVf"\"", + "/%" SVf "/ should probably be written as \"%" SVf "\"", SVfARG(msg), SVfARG(msg)); } } @@ -11491,7 +11491,7 @@ Perl_ck_entersub_args_proto(pTHX_ OP *entersubop, GV *namegv, SV *protosv) if (proto >= proto_end) { SV * const namesv = cv_name((CV *)namegv, NULL, 0); - yyerror_pv(Perl_form(aTHX_ "Too many arguments for %"SVf, + yyerror_pv(Perl_form(aTHX_ "Too many arguments for %" SVf, SVfARG(namesv)), SvUTF8(namesv)); return entersubop; } @@ -11653,7 +11653,7 @@ Perl_ck_entersub_args_proto(pTHX_ OP *entersubop, GV *namegv, SV *protosv) continue; default: oops: { - Perl_croak(aTHX_ "Malformed prototype for %"SVf": %"SVf, + Perl_croak(aTHX_ "Malformed prototype for %" SVf ": %" SVf, SVfARG(cv_name((CV *)namegv, NULL, 0)), SVfARG(protosv)); } @@ -11671,7 +11671,7 @@ Perl_ck_entersub_args_proto(pTHX_ OP *entersubop, GV *namegv, SV *protosv) (*proto != '@' && *proto != '%' && *proto != ';' && *proto != '_')) { SV * const namesv = cv_name((CV *)namegv, NULL, 0); - yyerror_pv(Perl_form(aTHX_ "Not enough arguments for %"SVf, + yyerror_pv(Perl_form(aTHX_ "Not enough arguments for %" SVf, SVfARG(namesv)), SvUTF8(namesv)); } return entersubop; @@ -11739,7 +11739,7 @@ Perl_ck_entersub_args_core(pTHX_ OP *entersubop, GV *namegv, SV *protosv) case 'L': return newSVOP( OP_CONST, 0, Perl_newSVpvf(aTHX_ - "%"IVdf, (IV)CopLINE(PL_curcop) + "%" IVdf, (IV)CopLINE(PL_curcop) ) ); case 'P': return newSVOP(OP_CONST, 0, @@ -12185,7 +12185,7 @@ Perl_ck_length(pTHX_ OP *o) } if (name) Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "length() used on %"SVf" (did you mean \"scalar(%s%"SVf + "length() used on %" SVf " (did you mean \"scalar(%s%" SVf ")\"?)", SVfARG(name), hash ? "keys " : "", SVfARG(name) ); @@ -15002,8 +15002,8 @@ Perl_report_redefined_cv(pTHX_ const SV *name, const CV *old_cv, ) Perl_warner(aTHX_ packWARN(WARN_REDEFINE), is_const - ? "Constant subroutine %"SVf" redefined" - : "Subroutine %"SVf" redefined", + ? "Constant subroutine %" SVf " redefined" + : "Subroutine %" SVf " redefined", SVfARG(name)); } @@ -258,8 +258,8 @@ Perl_pad_new(pTHX_ int flags) } DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] new: compcv=0x%"UVxf - " name=0x%"UVxf" flags=0x%"UVxf"\n", + "Pad 0x%" UVxf "[0x%" UVxf "] new: compcv=0x%" UVxf + " name=0x%" UVxf " flags=0x%" UVxf "\n", PTR2UV(PL_comppad), PTR2UV(PL_curpad), PTR2UV(PL_compcv), PTR2UV(padname), (UV)flags ) @@ -300,7 +300,7 @@ Perl_cv_undef_flags(pTHX_ CV *cv, U32 flags) PERL_ARGS_ASSERT_CV_UNDEF_FLAGS; DEBUG_X(PerlIO_printf(Perl_debug_log, - "CV undef: cv=0x%"UVxf" comppad=0x%"UVxf"\n", + "CV undef: cv=0x%" UVxf " comppad=0x%" UVxf "\n", PTR2UV(cv), PTR2UV(PL_comppad)) ); @@ -375,7 +375,7 @@ Perl_cv_undef_flags(pTHX_ CV *cv, U32 flags) subs to the outer of this cv. */ DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad undef: cv=0x%"UVxf" padlist=0x%"UVxf" comppad=0x%"UVxf"\n", + "Pad undef: cv=0x%" UVxf " padlist=0x%" UVxf " comppad=0x%" UVxf "\n", PTR2UV(cv), PTR2UV(padlist), PTR2UV(PL_comppad)) ); @@ -623,7 +623,7 @@ Perl_pad_add_name_pvn(pTHX_ const char *namepv, STRLEN namelen, sv_upgrade(PL_curpad[offset], SVt_PVCV); assert(SvPADMY(PL_curpad[offset])); DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad addname: %ld \"%s\" new lex=0x%"UVxf"\n", + "Pad addname: %ld \"%s\" new lex=0x%" UVxf "\n", (long)offset, PadnamePV(name), PTR2UV(PL_curpad[offset]))); @@ -756,7 +756,7 @@ Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype) PL_curpad = AvARRAY(PL_comppad); DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] alloc: %ld for %s\n", + "Pad 0x%" UVxf "[0x%" UVxf "] alloc: %ld for %s\n", PTR2UV(PL_comppad), PTR2UV(PL_curpad), (long) retval, PL_op_name[optype])); #ifdef DEBUG_LEAKING_SCALARS @@ -876,7 +876,7 @@ S_pad_check_dup(pTHX_ PADNAME *name, U32 flags, const HV *ourstash) break; /* "our" masking "our" */ /* diag_listed_as: "%s" variable %s masks earlier declaration in same %s */ Perl_warner(aTHX_ packWARN(WARN_MISC), - "\"%s\" %s %"PNf" masks earlier declaration in same %s", + "\"%s\" %s %" PNf " masks earlier declaration in same %s", ( is_our ? "our" : PL_parser->in_my == KEY_my ? "my" : PL_parser->in_my == KEY_sigvar ? "my" : @@ -902,7 +902,7 @@ S_pad_check_dup(pTHX_ PADNAME *name, U32 flags, const HV *ourstash) && memEQ(PadnamePV(sv), PadnamePV(name), PadnameLEN(name))) { Perl_warner(aTHX_ packWARN(WARN_MISC), - "\"our\" variable %"PNf" redeclared", PNfARG(sv)); + "\"our\" variable %" PNf " redeclared", PNfARG(sv)); if (off <= PL_comppad_name_floor) Perl_warner(aTHX_ packWARN(WARN_MISC), "\t(Did you mean \"local\" instead of \"our\"?)\n"); @@ -1084,7 +1084,7 @@ S_unavailable(pTHX_ PADNAME *name) { /* diag_listed_as: Variable "%s" is not available */ Perl_ck_warner(aTHX_ packWARN(WARN_CLOSURE), - "%se \"%"PNf"\" is not available", + "%se \"%" PNf "\" is not available", *PadnamePV(name) == '&' ? "Subroutin" : "Variabl", @@ -1111,7 +1111,7 @@ S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, *out_flags = 0; DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad findlex cv=0x%"UVxf" searching \"%.*s\" seq=%d%s\n", + "Pad findlex cv=0x%" UVxf " searching \"%.*s\" seq=%d%s\n", PTR2UV(cv), (int)namelen, namepv, (int)seq, out_capture ? " capturing" : "" )); @@ -1155,7 +1155,7 @@ S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, ? PAD_FAKELEX_MULTI : 0; DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad findlex cv=0x%"UVxf" matched: offset=%ld (%lu,%lu)\n", + "Pad findlex cv=0x%" UVxf " matched: offset=%ld (%lu,%lu)\n", PTR2UV(cv), (long)offset, (unsigned long)COP_SEQ_RANGE_LOW(*out_name), (unsigned long)COP_SEQ_RANGE_HIGH(*out_name))); @@ -1165,7 +1165,7 @@ S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, *out_name = name_p[offset]; /* return the name */ *out_flags = PARENT_FAKELEX_FLAGS(*out_name); DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad findlex cv=0x%"UVxf" matched: offset=%ld flags=0x%lx index=%lu\n", + "Pad findlex cv=0x%" UVxf " matched: offset=%ld flags=0x%lx index=%lu\n", PTR2UV(cv), (long)offset, (unsigned long)*out_flags, (unsigned long) PARENT_PAD_INDEX(*out_name) )); @@ -1203,7 +1203,7 @@ S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, /* diag_listed_as: Variable "%s" will not stay shared */ Perl_warner(aTHX_ packWARN(WARN_CLOSURE), - "%se \"%"UTF8f"\" will not stay shared", + "%se \"%" UTF8f "\" will not stay shared", *namepv == '&' ? "Subroutin" : "Variabl", UTF8fARG(1, namelen, namepv)); } @@ -1214,7 +1214,7 @@ S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, PADNAME *n; /* not yet caught - look further up */ DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad findlex cv=0x%"UVxf" chasing lex in outer pad\n", + "Pad findlex cv=0x%" UVxf " chasing lex in outer pad\n", PTR2UV(cv))); n = *out_name; (void) pad_findlex(namepv, namelen, flags, CvOUTSIDE(cv), @@ -1227,7 +1227,7 @@ S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, *out_capture = AvARRAY(PadlistARRAY(padlist)[ CvDEPTH(cv) ? CvDEPTH(cv) : 1])[offset]; DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad findlex cv=0x%"UVxf" found lex=0x%"UVxf"\n", + "Pad findlex cv=0x%" UVxf " found lex=0x%" UVxf "\n", PTR2UV(cv), PTR2UV(*out_capture))); if (SvPADSTALE(*out_capture) @@ -1316,7 +1316,7 @@ S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, /* But also note the offset, as newMYSUB needs it */ PARENT_PAD_INDEX_set(new_name, offset); DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad findlex cv=0x%"UVxf" saved captured sv 0x%"UVxf" at offset %ld\n", + "Pad findlex cv=0x%" UVxf " saved captured sv 0x%" UVxf " at offset %ld\n", PTR2UV(cv), PTR2UV(*new_capturep), (long)new_offset)); } *out_name = new_name; @@ -1348,7 +1348,7 @@ Perl_pad_sv(pTHX_ PADOFFSET po) if (!po) Perl_croak(aTHX_ "panic: pad_sv po"); DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] sv: %ld sv=0x%"UVxf"\n", + "Pad 0x%" UVxf "[0x%" UVxf "] sv: %ld sv=0x%" UVxf "\n", PTR2UV(PL_comppad), PTR2UV(PL_curpad), (long)po, PTR2UV(PL_curpad[po])) ); return PL_curpad[po]; @@ -1371,7 +1371,7 @@ Perl_pad_setsv(pTHX_ PADOFFSET po, SV* sv) ASSERT_CURPAD_ACTIVE("pad_setsv"); DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] setsv: %ld sv=0x%"UVxf"\n", + "Pad 0x%" UVxf "[0x%" UVxf "] setsv: %ld sv=0x%" UVxf "\n", PTR2UV(PL_comppad), PTR2UV(PL_curpad), (long)po, PTR2UV(sv)) ); PL_curpad[po] = sv; @@ -1489,7 +1489,7 @@ Perl_pad_leavemy(pTHX) const PADNAME * const name = svp[off]; if (name && PadnameLEN(name) && !PadnameOUTER(name)) Perl_ck_warner_d(aTHX_ packWARN(WARN_INTERNAL), - "%"PNf" never introduced", + "%" PNf " never introduced", PNfARG(name)); } } @@ -1544,7 +1544,7 @@ Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust) (long)po, (long)AvFILLp(PL_comppad)); DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] swipe: %ld\n", + "Pad 0x%" UVxf "[0x%" UVxf "] swipe: %ld\n", PTR2UV(PL_comppad), PTR2UV(PL_curpad), (long)po)); if (refadjust) @@ -1595,7 +1595,7 @@ S_pad_reset(pTHX) AvARRAY(PL_comppad), PL_curpad); DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] reset: padix %ld -> %ld", + "Pad 0x%" UVxf "[0x%" UVxf "] reset: padix %ld -> %ld", PTR2UV(PL_comppad), PTR2UV(PL_curpad), (long)PL_padix, (long)PL_padix_floor ) @@ -1654,7 +1654,7 @@ Perl_pad_tidy(pTHX_ padtidy_type type) break; /* no need to mark already-compiled code */ if (CvANON(cv)) { DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad clone on cv=0x%"UVxf"\n", PTR2UV(cv))); + "Pad clone on cv=0x%" UVxf "\n", PTR2UV(cv))); CvCLONE_on(cv); } CvHASEVAL_on(cv); @@ -1750,7 +1750,7 @@ Perl_pad_free(pTHX_ PADOFFSET po) Perl_croak(aTHX_ "panic: pad_free po"); DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] free: %ld\n", + "Pad 0x%" UVxf "[0x%" UVxf "] free: %ld\n", PTR2UV(PL_comppad), PTR2UV(PL_curpad), (long)po) ); @@ -1791,7 +1791,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full) pname = PadnamelistARRAY(pad_name); ppad = AvARRAY(pad); Perl_dump_indent(aTHX_ level, file, - "PADNAME = 0x%"UVxf"(0x%"UVxf") PAD = 0x%"UVxf"(0x%"UVxf")\n", + "PADNAME = 0x%" UVxf "(0x%" UVxf ") PAD = 0x%" UVxf "(0x%" UVxf ")\n", PTR2UV(pad_name), PTR2UV(pname), PTR2UV(pad), PTR2UV(ppad) ); @@ -1803,7 +1803,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full) if (namesv) { if (PadnameOUTER(namesv)) Perl_dump_indent(aTHX_ level+1, file, - "%2d. 0x%"UVxf"<%lu> FAKE \"%s\" flags=0x%lx index=%lu\n", + "%2d. 0x%" UVxf "<%lu> FAKE \"%s\" flags=0x%lx index=%lu\n", (int) ix, PTR2UV(ppad[ix]), (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0), @@ -1814,7 +1814,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full) ); else Perl_dump_indent(aTHX_ level+1, file, - "%2d. 0x%"UVxf"<%lu> (%lu,%lu) \"%s\"\n", + "%2d. 0x%" UVxf "<%lu> (%lu,%lu) \"%s\"\n", (int) ix, PTR2UV(ppad[ix]), (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0), @@ -1825,7 +1825,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full) } else if (full) { Perl_dump_indent(aTHX_ level+1, file, - "%2d. 0x%"UVxf"<%lu>\n", + "%2d. 0x%" UVxf "<%lu>\n", (int) ix, PTR2UV(ppad[ix]), (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0) @@ -1853,7 +1853,7 @@ S_cv_dump(pTHX_ const CV *cv, const char *title) PERL_ARGS_ASSERT_CV_DUMP; PerlIO_printf(Perl_debug_log, - " %s: CV=0x%"UVxf" (%s), OUTSIDE=0x%"UVxf" (%s)\n", + " %s: CV=0x%" UVxf " (%s), OUTSIDE=0x%" UVxf " (%s)\n", title, PTR2UV(cv), (CvANON(cv) ? "ANON" @@ -1869,7 +1869,7 @@ S_cv_dump(pTHX_ const CV *cv, const char *title) : CvGV(outside) ? GvNAME(CvGV(outside)) : "UNDEFINED")); PerlIO_printf(Perl_debug_log, - " PADLIST = 0x%"UVxf"\n", PTR2UV(padlist)); + " PADLIST = 0x%" UVxf "\n", PTR2UV(padlist)); do_dump_pad(1, Perl_debug_log, padlist, 1); } @@ -644,11 +644,11 @@ perl_destruct(pTHXx) PerlIO_printf(Perl_debug_log, "Trace of all OPs executed:\n"); for (i = 0; i <= OP_max; ++i) { if (PL_op_exec_cnt[i]) - PerlIO_printf(Perl_debug_log, " %s: %"UVuf"\n", PL_op_name[i], PL_op_exec_cnt[i]); + PerlIO_printf(Perl_debug_log, " %s: %" UVuf "\n", PL_op_name[i], PL_op_exec_cnt[i]); } /* Utility slot for easily doing little tracing experiments in the runloop: */ if (PL_op_exec_cnt[OP_max+1] != 0) - PerlIO_printf(Perl_debug_log, " SPECIAL: %"UVuf"\n", PL_op_exec_cnt[OP_max+1]); + PerlIO_printf(Perl_debug_log, " SPECIAL: %" UVuf "\n", PL_op_exec_cnt[OP_max+1]); PerlIO_printf(Perl_debug_log, "\n"); no_trace_out: #endif @@ -1284,8 +1284,8 @@ perl_destruct(pTHXx) PerlIO_printf(Perl_debug_log, "leaked: sv=0x%p" " flags=0x%"UVxf " refcnt=%"UVuf pTHX__FORMAT "\n" - "\tallocated at %s:%d %s %s (parent 0x%"UVxf");" - "serial %"UVuf"\n", + "\tallocated at %s:%d %s %s (parent 0x%" UVxf ");" + "serial %" UVuf "\n", (void*)sv, (UV)sv->sv_flags, (UV)sv->sv_refcnt pTHX__VALUE, sv->sv_debug_file ? sv->sv_debug_file : "(unknown)", @@ -2179,7 +2179,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) it should be reported immediately as a build failure. */ (void)Perl_av_create_and_unshift_one(aTHX_ &PL_preambleav, Perl_newSVpvf(aTHX_ - "BEGIN { my $f = q%c%s%"SVf"/buildcustomize.pl%c; " + "BEGIN { my $f = q%c%s%" SVf "/buildcustomize.pl%c; " "do {local $!; -f $f }" " and do $f || die $@ || qq '$f: $!' }", 0, (TAINTING_get ? "./" : ""), SVfARG(*inc0), 0)); @@ -3581,7 +3581,7 @@ S_minus_v(pTHX) "\nThis is perl " STRINGIFY(PERL_REVISION) ", version " STRINGIFY(PERL_VERSION) ", subversion " STRINGIFY(PERL_SUBVERSION) - " (%"SVf") built for " ARCHNAME, SVfARG(level) + " (%" SVf ") built for " ARCHNAME, SVfARG(level) ); SvREFCNT_dec_NN(level); } @@ -3875,7 +3875,7 @@ S_open_script(pTHX_ const char *scriptname, bool dosearch, bool *suidscript) if (!rsfp) { /* PSz 16 Sep 03 Keep neat error message */ if (PL_e_script) - Perl_croak(aTHX_ "Can't open "BIT_BUCKET": %s\n", Strerror(errno)); + Perl_croak(aTHX_ "Can't open " BIT_BUCKET ": %s\n", Strerror(errno)); else Perl_croak(aTHX_ "Can't open perl script \"%s\": %s\n", CopFILE(PL_curcop), Strerror(errno)); @@ -5033,7 +5033,7 @@ Perl_call_list(pTHX_ I32 oldscope, AV *paramList) while (PL_scopestack_ix > oldscope) LEAVE; JMPENV_POP; - Perl_croak(aTHX_ "%"SVf"", SVfARG(atsv)); + Perl_croak(aTHX_ "%" SVf, SVfARG(atsv)); } break; case 1: @@ -5971,8 +5971,8 @@ typedef struct am_table_short AMTS; STMT_START { \ if (! PL_in_utf8_CTYPE_locale && ckWARN(WARN_LOCALE)) { \ Perl_warner(aTHX_ packWARN(WARN_LOCALE), \ - "Wide character (U+%"UVXf") in %s", \ - (UV) cp, OP_DESC(PL_op)); \ + "Wide character (U+%" UVXf ") in %s",\ + (UV) cp, OP_DESC(PL_op)); \ } \ } STMT_END @@ -5981,7 +5981,7 @@ typedef struct am_table_short AMTS; if (! PL_in_utf8_CTYPE_locale && ckWARN(WARN_LOCALE)) { \ UV cp = utf8_to_uvchr_buf((U8 *) s, (U8 *) send, NULL); \ Perl_warner(aTHX_ packWARN(WARN_LOCALE), \ - "Wide character (U+%"UVXf") in %s", \ + "Wide character (U+%" UVXf ") in %s", \ (cp == 0) \ ? UNICODE_REPLACEMENT \ : (UV) cp, \ @@ -1130,7 +1130,7 @@ PerlIO_push(pTHX_ PerlIO *f, PERLIO_FUNCS_DECL(*tab), const char *mode, SV *arg) VERIFY_HEAD(f); if (tab->fsize != sizeof(PerlIO_funcs)) { Perl_croak( aTHX_ - "%s (%"UVuf") does not match %s (%"UVuf")", + "%s (%" UVuf ") does not match %s (%" UVuf ")", "PerlIO layer function table size", (UV)tab->fsize, "size expected by this perl", (UV)sizeof(PerlIO_funcs) ); } @@ -1138,7 +1138,7 @@ PerlIO_push(pTHX_ PerlIO *f, PERLIO_FUNCS_DECL(*tab), const char *mode, SV *arg) PerlIOl *l; if (tab->size < sizeof(PerlIOl)) { Perl_croak( aTHX_ - "%s (%"UVuf") smaller than %s (%"UVuf")", + "%s (%" UVuf ") smaller than %s (%" UVuf ")", "PerlIO layer instance size", (UV)tab->size, "size expected by this perl", (UV)sizeof(PerlIOl) ); } @@ -100,7 +100,7 @@ yysymprint(pTHX_ PerlIO * const yyoutput, int yytype, const YYSTYPE * const yyva # ifdef YYPRINT YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); # else - YYFPRINTF (yyoutput, "0x%"UVxf, (UV)yyvaluep->ival); + YYFPRINTF (yyoutput, "0x%" UVxf, (UV)yyvaluep->ival); # endif } else @@ -146,10 +146,10 @@ yy_stack_print (pTHX_ const yy_parser *parser) ); break; case toketype_ival: - PerlIO_printf(Perl_debug_log, " %8"IVdf, (IV)ps->val.ival); + PerlIO_printf(Perl_debug_log, " %8" IVdf, (IV)ps->val.ival); break; default: - PerlIO_printf(Perl_debug_log, " %8"UVxf, (UV)ps->val.ival); + PerlIO_printf(Perl_debug_log, " %8" UVxf, (UV)ps->val.ival); } } PerlIO_printf(Perl_debug_log, "\n\n"); @@ -492,7 +492,7 @@ PP(pp_prototype) if (strnEQ(s, "CORE::", 6)) { const int code = keyword(s + 6, SvCUR(TOPs) - 6, 1); if (!code) - DIE(aTHX_ "Can't find an opnumber for \"%"UTF8f"\"", + DIE(aTHX_ "Can't find an opnumber for \"%" UTF8f "\"", UTF8fARG(SvFLAGS(TOPs) & SVf_UTF8, SvCUR(TOPs)-6, s+6)); { SV * const sv = core_prototype(NULL, s + 6, code, NULL); @@ -983,7 +983,7 @@ PP(pp_undef) case SVt_PVCV: if (cv_const_sv((const CV *)sv)) Perl_ck_warner(aTHX_ packWARN(WARN_MISC), - "Constant subroutine %"SVf" undefined", + "Constant subroutine %" SVf " undefined", SVfARG(CvANON((const CV *)sv) ? newSVpvs_flags("(anonymous)", SVs_TEMP) : sv_2mortal(newSVhek( @@ -2977,7 +2977,7 @@ PP(pp_sin) (op_type == OP_LOG ? (value <= 0.0) : (value < 0.0))) { SET_NUMERIC_STANDARD(); /* diag_listed_as: Can't take log of %g */ - DIE(aTHX_ "Can't take %s of %"NVgf, neg_report, value); + DIE(aTHX_ "Can't take %s of %" NVgf, neg_report, value); } } switch (op_type) { @@ -3643,7 +3643,7 @@ PP(pp_chr) if (UNLIKELY(SvAMAGIC(top))) top = sv_2num(top); if (UNLIKELY(isinfnansv(top))) - Perl_croak(aTHX_ "Cannot chr %"NVgf, SvNV(top)); + Perl_croak(aTHX_ "Cannot chr %" NVgf, SvNV(top)); else { if (!IN_BYTES /* under bytes, chr(-1) eq chr(0xff), etc. */ && ((SvIOKp(top) && !SvIsUV(top) && SvIV_nomg(top) < 0) @@ -3658,7 +3658,7 @@ PP(pp_chr) top = top2; } Perl_warner(aTHX_ packWARN(WARN_UTF8), - "Invalid negative number (%"SVf") in chr", SVfARG(top)); + "Invalid negative number (%" SVf ") in chr", SVfARG(top)); } value = UNICODE_REPLACEMENT; } else { @@ -63,7 +63,7 @@ Refetch the stack pointer. Used after a callback. See L<perlcall>. mark_stack_entry = markstack_grow(); \ *mark_stack_entry = (I32)((p) - PL_stack_base); \ DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, \ - "MARK push %p %"IVdf"\n", \ + "MARK push %p %" IVdf "\n", \ PL_markstack_ptr, (IV)*mark_stack_entry))); \ } STMT_END @@ -73,7 +73,7 @@ Refetch the stack pointer. Used after a callback. See L<perlcall>. #define INCMARK \ STMT_START { \ DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, \ - "MARK inc %p %"IVdf"\n", \ + "MARK inc %p %" IVdf "\n", \ (PL_markstack_ptr+1), (IV)*(PL_markstack_ptr+1)))); \ PL_markstack_ptr++; \ } STMT_END @@ -1573,7 +1573,7 @@ Perl_qerror(pTHX_ SV *err) if (PL_in_eval) { if (PL_in_eval & EVAL_KEEPERR) { - Perl_ck_warner(aTHX_ packWARN(WARN_MISC), "\t(in cleanup) %"SVf, + Perl_ck_warner(aTHX_ packWARN(WARN_MISC), "\t(in cleanup) %" SVf, SVfARG(err)); } else @@ -1582,7 +1582,7 @@ Perl_qerror(pTHX_ SV *err) else if (PL_errors) sv_catsv(PL_errors, err); else - Perl_warn(aTHX_ "%"SVf, SVfARG(err)); + Perl_warn(aTHX_ "%" SVf, SVfARG(err)); if (PL_parser) ++PL_parser->error_count; } @@ -1622,12 +1622,12 @@ S_pop_eval_context_maybe_croak(pTHX_ PERL_CONTEXT *cx, SV *errsv, int action) if (action == 1) { (void)hv_delete(inc_hv, key, klen, G_DISCARD); - fmt = "%"SVf" did not return a true value"; + fmt = "%" SVf " did not return a true value"; errsv = namesv; } else { (void)hv_store(inc_hv, key, klen, &PL_sv_undef, 0); - fmt = "%"SVf"Compilation failed in require"; + fmt = "%" SVf "Compilation failed in require"; if (!errsv) errsv = newSVpvs_flags("Unknown error\n", SVs_TEMP); } @@ -1691,7 +1691,7 @@ Perl_die_unwind(pTHX_ SV *msv) (SV_GMAGIC|SV_DO_COW_SVSETSV|SV_NOSTEAL)); if (in_eval & EVAL_KEEPERR) { - Perl_ck_warner(aTHX_ packWARN(WARN_MISC), "\t(in cleanup) %"SVf, + Perl_ck_warner(aTHX_ packWARN(WARN_MISC), "\t(in cleanup) %" SVf, SVfARG(exceptsv)); } @@ -2522,7 +2522,7 @@ S_unwind_loop(pTHX) cxix = dopoptolabel(label, label_len, label_flags); if (cxix < 0) /* diag_listed_as: Label not found for "last %s" */ - Perl_croak(aTHX_ "Label not found for \"%s %"SVf"\"", + Perl_croak(aTHX_ "Label not found for \"%s %" SVf "\"", OP_NAME(PL_op), SVfARG(PL_op->op_flags & OPf_STACKED && !SvGMAGICAL(TOPp1s) @@ -2708,7 +2708,7 @@ PP(pp_goto) continue; tmpstr = sv_newmortal(); gv_efullname3(tmpstr, gv, NULL); - DIE(aTHX_ "Goto undefined subroutine &%"SVf"", SVfARG(tmpstr)); + DIE(aTHX_ "Goto undefined subroutine &%" SVf, SVfARG(tmpstr)); } DIE(aTHX_ "Goto undefined subroutine"); } @@ -2779,7 +2779,7 @@ PP(pp_goto) if (gv) { SV * const tmpstr = sv_newmortal(); gv_efullname3(tmpstr, gv, NULL); - DIE(aTHX_ "Goto undefined subroutine &%"SVf"", + DIE(aTHX_ "Goto undefined subroutine &%" SVf, SVfARG(tmpstr)); } DIE(aTHX_ "Goto undefined subroutine"); @@ -2994,7 +2994,7 @@ PP(pp_goto) PL_lastgotoprobe = gotoprobe; } if (!retop) - DIE(aTHX_ "Can't find label %"UTF8f, + DIE(aTHX_ "Can't find label %" UTF8f, UTF8fARG(label_flags, label_len, label)); /* if we're leaving an eval, check before we pop any frames @@ -3608,7 +3608,7 @@ S_require_version(pTHX_ SV *sv) upg_version(PL_patchlevel, TRUE); if (cUNOP->op_first->op_type == OP_CONST && cUNOP->op_first->op_private & OPpCONST_NOVER) { if ( vcmp(sv,PL_patchlevel) <= 0 ) - DIE(aTHX_ "Perls since %"SVf" too modern--this is %"SVf", stopped", + DIE(aTHX_ "Perls since %" SVf " too modern--this is %" SVf ", stopped", SVfARG(sv_2mortal(vnormal(sv))), SVfARG(sv_2mortal(vnormal(PL_patchlevel))) ); @@ -3629,8 +3629,8 @@ S_require_version(pTHX_ SV *sv) || av_tindex(lav) > 1 /* FP with > 3 digits */ || strstr(SvPVX(pv),".0") /* FP with leading 0 */ ) { - DIE(aTHX_ "Perl %"SVf" required--this is only " - "%"SVf", stopped", + DIE(aTHX_ "Perl %" SVf " required--this is only " + "%" SVf ", stopped", SVfARG(sv_2mortal(vnormal(req))), SVfARG(sv_2mortal(vnormal(PL_patchlevel))) ); @@ -3647,8 +3647,8 @@ S_require_version(pTHX_ SV *sv) (int)first, (int)second); upg_version(hintsv, TRUE); - DIE(aTHX_ "Perl %"SVf" required (did you mean %"SVf"?)" - "--this is only %"SVf", stopped", + DIE(aTHX_ "Perl %" SVf " required (did you mean %" SVf "?)" + "--this is only %" SVf ", stopped", SVfARG(sv_2mortal(vnormal(req))), SVfARG(sv_2mortal(vnormal(sv_2mortal(hintsv)))), SVfARG(sv_2mortal(vnormal(PL_patchlevel))) @@ -3770,7 +3770,7 @@ S_require_file(pTHX_ SV *const sv) that the generated filename ends .pm */ if (!path_searchable || len < 3 || name[0] == '.' || !memEQ(name + package_len, ".pm", 3)) - DIE(aTHX_ "Bareword in require maps to disallowed filename \"%"SVf"\"", sv); + DIE(aTHX_ "Bareword in require maps to disallowed filename \"%" SVf "\"", sv); if (memchr(name, 0, package_len)) { /* diag_listed_as: Bareword in require contains "%s" */ DIE(aTHX_ "Bareword in require contains \"\\0\""); @@ -3825,7 +3825,7 @@ S_require_file(pTHX_ SV *const sv) SvGETMAGIC(loader); } - Perl_sv_setpvf(aTHX_ namesv, "/loader/0x%"UVxf"/%s", + Perl_sv_setpvf(aTHX_ namesv, "/loader/0x%" UVxf "/%s", PTR2UV(SvRV(dirsv)), name); tryname = SvPVX_const(namesv); tryrsfp = NULL; @@ -4224,7 +4224,7 @@ PP(pp_entereval) if (PERLDB_NAMEEVAL && CopLINE(PL_curcop)) { SV * const temp_sv = sv_newmortal(); - Perl_sv_setpvf(aTHX_ temp_sv, "_<(eval %lu)[%s:%"IVdf"]", + Perl_sv_setpvf(aTHX_ temp_sv, "_<(eval %lu)[%s:%" IVdf "]", (unsigned long)++PL_evalseq, CopFILE(PL_curcop), (IV)CopLINE(PL_curcop)); tmpbuf = SvPVX(temp_sv); @@ -1983,7 +1983,7 @@ PP(pp_match) if (RX_MINLEN(rx) >= 0 && (STRLEN)RX_MINLEN(rx) > len) { DEBUG_r(PerlIO_printf(Perl_debug_log, "String shorter than min possible regex match (%" - UVuf" < %"IVdf")\n", + UVuf " < %" IVdf ")\n", (UV)len, (IV)RX_MINLEN(rx))); goto nope; } @@ -2079,7 +2079,7 @@ PP(pp_match) if (UNLIKELY(RX_OFFS(rx)[i].end < 0 || RX_OFFS(rx)[i].start < 0 || len < 0 || len > strend - s)) DIE(aTHX_ "panic: pp_match start/end pointers, i=%ld, " - "start=%ld, end=%ld, s=%p, strend=%p, len=%"UVuf, + "start=%ld, end=%ld, s=%p, strend=%p, len=%" UVuf, (long) i, (long) RX_OFFS(rx)[i].start, (long)RX_OFFS(rx)[i].end, s, strend, (UV) len); sv_setpvn(*SP, s, len); @@ -2537,7 +2537,7 @@ PP(pp_multideref) if (UNLIKELY(SvROK(elemsv) && !SvGAMAGIC(elemsv) && ckWARN(WARN_MISC))) Perl_warner(aTHX_ packWARN(WARN_MISC), - "Use of reference \"%"SVf"\" as array index", + "Use of reference \"%" SVf "\" as array index", SVfARG(elemsv)); /* the only time that S_find_uninit_var() needs this * is to determine which index value triggered the @@ -4007,7 +4007,7 @@ PP(pp_entersub) /* anonymous or undef'd function leaves us no recourse */ if (CvLEXICAL(cv) && CvHASGV(cv)) - DIE(aTHX_ "Undefined subroutine &%"SVf" called", + DIE(aTHX_ "Undefined subroutine &%" SVf " called", SVfARG(cv_name(cv, NULL, 0))); if (CvANON(cv) || !CvHASGV(cv)) { DIE(aTHX_ "Undefined subroutine called"); @@ -4030,7 +4030,7 @@ PP(pp_entersub) if (!cv) { sub_name = sv_newmortal(); gv_efullname3(sub_name, gv, NULL); - DIE(aTHX_ "Undefined subroutine &%"SVf" called", SVfARG(sub_name)); + DIE(aTHX_ "Undefined subroutine &%" SVf " called", SVfARG(sub_name)); } } @@ -4119,7 +4119,7 @@ PP(pp_entersub) } if (UNLIKELY((cx->blk_u16 & OPpENTERSUB_LVAL_MASK) == OPpLVAL_INTRO && !CvLVALUE(cv))) - DIE(aTHX_ "Can't modify non-lvalue subroutine call of &%"SVf, + DIE(aTHX_ "Can't modify non-lvalue subroutine call of &%" SVf, SVfARG(cv_name(cv, NULL, 0))); /* warning must come *after* we fully set up the context * stuff so that __WARN__ handlers can safely dounwind() @@ -4146,7 +4146,7 @@ PP(pp_entersub) & CX_PUSHSUB_GET_LVALUE_MASK(Perl_is_lvalue_sub) ) & OPpENTERSUB_LVAL_MASK) == OPpLVAL_INTRO && !CvLVALUE(cv))) - DIE(aTHX_ "Can't modify non-lvalue subroutine call of &%"SVf, + DIE(aTHX_ "Can't modify non-lvalue subroutine call of &%" SVf, SVfARG(cv_name(cv, NULL, 0))); if (UNLIKELY(!(PL_op->op_flags & OPf_STACKED) && GvAV(PL_defgv))) { @@ -4225,7 +4225,7 @@ Perl_sub_crush_depth(pTHX_ CV *cv) if (CvANON(cv)) Perl_warner(aTHX_ packWARN(WARN_RECURSION), "Deep recursion on anonymous subroutine"); else { - Perl_warner(aTHX_ packWARN(WARN_RECURSION), "Deep recursion on subroutine \"%"SVf"\"", + Perl_warner(aTHX_ packWARN(WARN_RECURSION), "Deep recursion on subroutine \"%" SVf "\"", SVfARG(cv_name(cv,NULL,0))); } } @@ -4267,7 +4267,7 @@ PP(pp_aelem) if (UNLIKELY(SvROK(elemsv) && !SvGAMAGIC(elemsv) && ckWARN(WARN_MISC))) Perl_warner(aTHX_ packWARN(WARN_MISC), - "Use of reference \"%"SVf"\" as array index", + "Use of reference \"%" SVf "\" as array index", SVfARG(elemsv)); if (UNLIKELY(SvTYPE(av) != SVt_PVAV)) RETPUSHUNDEF; @@ -4374,7 +4374,7 @@ S_opmethod_stash(pTHX_ SV* meth) HV* stash; SV* const sv = PL_stack_base + TOPMARK == PL_stack_sp - ? (Perl_croak(aTHX_ "Can't call method \"%"SVf"\" without a " + ? (Perl_croak(aTHX_ "Can't call method \"%" SVf "\" without a " "package or object reference", SVfARG(meth)), (SV *)NULL) : *(PL_stack_base + TOPMARK + 1); @@ -4383,7 +4383,7 @@ S_opmethod_stash(pTHX_ SV* meth) if (UNLIKELY(!sv)) undefined: - Perl_croak(aTHX_ "Can't call method \"%"SVf"\" on an undefined value", + Perl_croak(aTHX_ "Can't call method \"%" SVf "\" on an undefined value", SVfARG(meth)); if (UNLIKELY(SvGMAGICAL(sv))) mg_get(sv); @@ -4397,7 +4397,7 @@ S_opmethod_stash(pTHX_ SV* meth) else if (!SvOK(sv)) goto undefined; else if (isGV_with_GP(sv)) { if (!GvIO(sv)) - Perl_croak(aTHX_ "Can't call method \"%"SVf"\" " + Perl_croak(aTHX_ "Can't call method \"%" SVf "\" " "without a package or object reference", SVfARG(meth)); ob = sv; @@ -4425,7 +4425,7 @@ S_opmethod_stash(pTHX_ SV* meth) /* this isn't the name of a filehandle either */ if (!packlen) { - Perl_croak(aTHX_ "Can't call method \"%"SVf"\" " + Perl_croak(aTHX_ "Can't call method \"%" SVf "\" " "without a package or object reference", SVfARG(meth)); } @@ -4444,7 +4444,7 @@ S_opmethod_stash(pTHX_ SV* meth) && (ob = MUTABLE_SV(GvIO((const GV *)ob))) && SvOBJECT(ob)))) { - Perl_croak(aTHX_ "Can't call method \"%"SVf"\" on unblessed reference", + Perl_croak(aTHX_ "Can't call method \"%" SVf "\" on unblessed reference", SVfARG((SvPVX(meth) == PL_isa_DOES) ? newSVpvs_flags("DOES", SVs_TEMP) : meth)); @@ -1585,7 +1585,8 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c if (++bytes >= sizeof(UV)) { /* promote to string */ const char *t; - sv = Perl_newSVpvf(aTHX_ "%.*"UVuf, (int)TYPE_DIGITS(UV), auv); + sv = Perl_newSVpvf(aTHX_ "%.*" UVuf, + (int)TYPE_DIGITS(UV), auv); while (s < strend) { ch = SHIFT_BYTE(utf8, s, strend, datumtype); sv = mul128(sv, (U8)(ch & 0x7f)); @@ -2063,9 +2064,9 @@ S_sv_check_infnan(pTHX_ SV *sv, I32 datumtype) const I32 c = TYPE_NO_MODIFIERS(datumtype); const NV nv = SvNV_nomg(sv); if (c == 'w') - Perl_croak(aTHX_ "Cannot compress %"NVgf" in pack", nv); + Perl_croak(aTHX_ "Cannot compress %" NVgf " in pack", nv); else - Perl_croak(aTHX_ "Cannot pack %"NVgf" with '%c'", nv, (int) c); + Perl_croak(aTHX_ "Cannot pack %" NVgf " with '%c'", nv, (int) c); } return sv; } @@ -2355,7 +2356,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist ) if (!S_utf8_to_bytes(aTHX_ &aptr, end, cur, fromlen, datumtype | TYPE_IS_PACK)) Perl_croak(aTHX_ "panic: predicted utf8 length not available, " - "for '%c', aptr=%p end=%p cur=%p, fromlen=%"UVuf, + "for '%c', aptr=%p end=%p cur=%p, fromlen=%" UVuf, (int)datumtype, aptr, end, cur, (UV)fromlen); cur += fromlen; len -= fromlen; @@ -1543,7 +1543,7 @@ PP(pp_sort) else { SV *tmpstr = sv_newmortal(); gv_efullname3(tmpstr, gv, NULL); - DIE(aTHX_ "Undefined sort subroutine \"%"SVf"\" called", + DIE(aTHX_ "Undefined sort subroutine \"%" SVf "\" called", SVfARG(tmpstr)); } } @@ -462,7 +462,7 @@ PP(pp_warn) } } if (SvROK(exsv) && !PL_warnhook) - Perl_warn(aTHX_ "%"SVf, SVfARG(exsv)); + Perl_warn(aTHX_ "%" SVf, SVfARG(exsv)); else warn_sv(exsv); RETSETYES; } @@ -630,7 +630,7 @@ PP(pp_open) if (IoDIRP(io)) Perl_ck_warner_d(aTHX_ packWARN2(WARN_IO, WARN_DEPRECATED), - "Opening dirhandle %"HEKf" also as a file", + "Opening dirhandle %" HEKf " also as a file", HEKfARG(GvENAME_HEK(gv))); mg = SvTIED_mg((const SV *)io, PERL_MAGIC_tiedscalar); @@ -706,8 +706,8 @@ PP(pp_pipe_op) if (PerlProc_pipe(fd) < 0) goto badexit; - IoIFP(rstio) = PerlIO_fdopen(fd[0], "r"PIPE_OPEN_MODE); - IoOFP(wstio) = PerlIO_fdopen(fd[1], "w"PIPE_OPEN_MODE); + IoIFP(rstio) = PerlIO_fdopen(fd[0], "r" PIPE_OPEN_MODE); + IoOFP(wstio) = PerlIO_fdopen(fd[1], "w" PIPE_OPEN_MODE); IoOFP(rstio) = IoIFP(rstio); IoIFP(wstio) = IoOFP(wstio); IoTYPE(rstio) = IoTYPE_RDONLY; @@ -957,8 +957,8 @@ PP(pp_tie) if (!SvCUR(*MARK)) { stashname = sv_2mortal(newSVpvs("main")); } - DIE(aTHX_ "Can't locate object method \"%s\" via package \"%"SVf"\"" - " (perhaps you forgot to load \"%"SVf"\"?)", + DIE(aTHX_ "Can't locate object method \"%s\" via package \"%" SVf "\"" + " (perhaps you forgot to load \"%" SVf "\"?)", methname, SVfARG(stashname), SVfARG(stashname)); } else if (!(gv = gv_fetchmethod(stash, methname))) { @@ -966,7 +966,7 @@ PP(pp_tie) * been deleted from the symbol table, which this one can't * be, since we just looked it up by name. */ - DIE(aTHX_ "Can't locate object method \"%s\" via package \"%"HEKf"\"", + DIE(aTHX_ "Can't locate object method \"%s\" via package \"%" HEKf "\"", methname, HvENAME_HEK_NN(stash)); } ENTER_with_name("call_TIE"); @@ -1032,7 +1032,7 @@ PP(pp_untie) } else if (mg && SvREFCNT(obj) > 1) { Perl_ck_warner(aTHX_ packWARN(WARN_UNTIE), - "untie attempted while %"UVuf" inner references still exist", + "untie attempted while %" UVuf " inner references still exist", (UV)SvREFCNT(obj) - 1 ) ; } } @@ -1445,7 +1445,7 @@ PP(pp_enterwrite) if (!cv) { tmpsv = sv_newmortal(); gv_efullname4(tmpsv, fgv, NULL, FALSE); - DIE(aTHX_ "Undefined format \"%"SVf"\" called", SVfARG(tmpsv)); + DIE(aTHX_ "Undefined format \"%" SVf "\" called", SVfARG(tmpsv)); } IoFLAGS(io) &= ~IOf_DIDTOP; RETURNOP(doform(cv,gv,PL_op->op_next)); @@ -1480,7 +1480,7 @@ PP(pp_leavewrite) SV *topname; if (!IoFMT_NAME(io)) IoFMT_NAME(io) = savepv(GvNAME(gv)); - topname = sv_2mortal(Perl_newSVpvf(aTHX_ "%"HEKf"_TOP", + topname = sv_2mortal(Perl_newSVpvf(aTHX_ "%" HEKf "_TOP", HEKfARG(GvNAME_HEK(gv)))); topgv = gv_fetchsv(topname, 0, SVt_PVFM); if ((topgv && GvFORM(topgv)) || @@ -1528,7 +1528,7 @@ PP(pp_leavewrite) if (!cv) { SV * const sv = sv_newmortal(); gv_efullname4(sv, fgv, NULL, FALSE); - DIE(aTHX_ "Undefined top format \"%"SVf"\" called", SVfARG(sv)); + DIE(aTHX_ "Undefined top format \"%" SVf "\" called", SVfARG(sv)); } return doform(cv, gv, PL_op); } @@ -2512,8 +2512,8 @@ PP(pp_socket) if (fd < 0) { RETPUSHUNDEF; } - IoIFP(io) = PerlIO_fdopen(fd, "r"SOCKET_OPEN_MODE); /* stdio gets confused about sockets */ - IoOFP(io) = PerlIO_fdopen(fd, "w"SOCKET_OPEN_MODE); + IoIFP(io) = PerlIO_fdopen(fd, "r" SOCKET_OPEN_MODE); /* stdio gets confused about sockets */ + IoOFP(io) = PerlIO_fdopen(fd, "w" SOCKET_OPEN_MODE); IoTYPE(io) = IoTYPE_SOCKET; if (!IoIFP(io) || !IoOFP(io)) { if (IoIFP(io)) PerlIO_close(IoIFP(io)); @@ -2553,11 +2553,11 @@ PP(pp_sockpair) TAINT_PROPER("socketpair"); if (PerlSock_socketpair(domain, type, protocol, fd) < 0) RETPUSHUNDEF; - IoIFP(io1) = PerlIO_fdopen(fd[0], "r"SOCKET_OPEN_MODE); - IoOFP(io1) = PerlIO_fdopen(fd[0], "w"SOCKET_OPEN_MODE); + IoIFP(io1) = PerlIO_fdopen(fd[0], "r" SOCKET_OPEN_MODE); + IoOFP(io1) = PerlIO_fdopen(fd[0], "w" SOCKET_OPEN_MODE); IoTYPE(io1) = IoTYPE_SOCKET; - IoIFP(io2) = PerlIO_fdopen(fd[1], "r"SOCKET_OPEN_MODE); - IoOFP(io2) = PerlIO_fdopen(fd[1], "w"SOCKET_OPEN_MODE); + IoIFP(io2) = PerlIO_fdopen(fd[1], "r" SOCKET_OPEN_MODE); + IoOFP(io2) = PerlIO_fdopen(fd[1], "w" SOCKET_OPEN_MODE); IoTYPE(io2) = IoTYPE_SOCKET; if (!IoIFP(io1) || !IoOFP(io1) || !IoIFP(io2) || !IoOFP(io2)) { if (IoIFP(io1)) PerlIO_close(IoIFP(io1)); @@ -2676,8 +2676,8 @@ PP(pp_accept) goto badexit; if (IoIFP(nstio)) do_close(ngv, FALSE); - IoIFP(nstio) = PerlIO_fdopen(fd, "r"SOCKET_OPEN_MODE); - IoOFP(nstio) = PerlIO_fdopen(fd, "w"SOCKET_OPEN_MODE); + IoIFP(nstio) = PerlIO_fdopen(fd, "r" SOCKET_OPEN_MODE); + IoOFP(nstio) = PerlIO_fdopen(fd, "w" SOCKET_OPEN_MODE); IoTYPE(nstio) = IoTYPE_SOCKET; if (!IoIFP(nstio) || !IoOFP(nstio)) { if (IoIFP(nstio)) PerlIO_close(IoIFP(nstio)); @@ -2892,7 +2892,7 @@ PP(pp_stat) if (gv != PL_defgv) { do_fstat_warning_check: Perl_ck_warner(aTHX_ packWARN(WARN_IO), - "lstat() on filehandle%s%"SVf, + "lstat() on filehandle%s%" SVf, gv ? " " : "", SVfARG(gv ? sv_2mortal(newSVhek(GvENAME_HEK(gv))) @@ -4008,7 +4008,7 @@ PP(pp_open_dir) if ((IoIFP(io) || IoOFP(io))) Perl_ck_warner_d(aTHX_ packWARN2(WARN_IO, WARN_DEPRECATED), - "Opening filehandle %"HEKf" also as a directory", + "Opening filehandle %" HEKf " also as a directory", HEKfARG(GvENAME_HEK(gv)) ); if (IoDIRP(io)) PerlDir_close(IoDIRP(io)); @@ -4043,7 +4043,7 @@ PP(pp_readdir) if (!IoDIRP(io)) { Perl_ck_warner(aTHX_ packWARN(WARN_IO), - "readdir() attempted on invalid dirhandle %"HEKf, + "readdir() attempted on invalid dirhandle %" HEKf, HEKfARG(GvENAME_HEK(gv))); goto nope; } @@ -4093,7 +4093,7 @@ PP(pp_telldir) if (!IoDIRP(io)) { Perl_ck_warner(aTHX_ packWARN(WARN_IO), - "telldir() attempted on invalid dirhandle %"HEKf, + "telldir() attempted on invalid dirhandle %" HEKf, HEKfARG(GvENAME_HEK(gv))); goto nope; } @@ -4119,7 +4119,7 @@ PP(pp_seekdir) if (!IoDIRP(io)) { Perl_ck_warner(aTHX_ packWARN(WARN_IO), - "seekdir() attempted on invalid dirhandle %"HEKf, + "seekdir() attempted on invalid dirhandle %" HEKf, HEKfARG(GvENAME_HEK(gv))); goto nope; } @@ -4144,7 +4144,7 @@ PP(pp_rewinddir) if (!IoDIRP(io)) { Perl_ck_warner(aTHX_ packWARN(WARN_IO), - "rewinddir() attempted on invalid dirhandle %"HEKf, + "rewinddir() attempted on invalid dirhandle %" HEKf, HEKfARG(GvENAME_HEK(gv))); goto nope; } @@ -4168,7 +4168,7 @@ PP(pp_closedir) if (!IoDIRP(io)) { Perl_ck_warner(aTHX_ packWARN(WARN_IO), - "closedir() attempted on invalid dirhandle %"HEKf, + "closedir() attempted on invalid dirhandle %" HEKf, HEKfARG(GvENAME_HEK(gv))); goto nope; } @@ -4771,7 +4771,7 @@ PP(pp_gmtime) else { dTARGET; PUSHs(TARG); - Perl_sv_setpvf_mg(aTHX_ TARG, "%s %s %2d %02d:%02d:%02d %"IVdf, + Perl_sv_setpvf_mg(aTHX_ TARG, "%s %s %2d %02d:%02d:%02d %" IVdf, dayname[tmbuf.tm_wday], monname[tmbuf.tm_mon], tmbuf.tm_mday, @@ -571,7 +571,7 @@ static const scan_data_t zero_scan_data = #define MARKER2 " <-- HERE " /* marker as it appears within the regex */ #define REPORT_LOCATION " in regex; marked by " MARKER1 \ - " in m/%"UTF8f MARKER2 "%"UTF8f"/" + " in m/%" UTF8f MARKER2 "%" UTF8f "/" /* The code in this file in places uses one level of recursion with parsing * rebased to an alternate string constructed by us in memory. This can take @@ -659,11 +659,11 @@ static const scan_data_t zero_scan_data = } STMT_END #define FAIL(msg) _FAIL( \ - Perl_croak(aTHX_ "%s in regex m/%"UTF8f"%s/", \ + Perl_croak(aTHX_ "%s in regex m/%" UTF8f "%s/", \ msg, UTF8fARG(UTF, len, RExC_precomp), ellipses)) #define FAIL2(msg,arg) _FAIL( \ - Perl_croak(aTHX_ msg " in regex m/%"UTF8f"%s/", \ + Perl_croak(aTHX_ msg " in regex m/%" UTF8f "%s/", \ arg, UTF8fARG(UTF, len, RExC_precomp), ellipses)) /* @@ -1000,24 +1000,25 @@ Perl_re_indentf(pTHX_ const char *fmt, U32 depth, ...) #define DEBUG_STUDYDATA(str,data,depth) \ DEBUG_OPTIMISE_MORE_r(if(data){ \ - Perl_re_indentf( aTHX_ "" str "Pos:%"IVdf"/%"IVdf \ - " Flags: 0x%"UVXf, \ + Perl_re_indentf( aTHX_ "" str "Pos:%" IVdf "/%" IVdf \ + " Flags: 0x%" UVXf, \ depth, \ (IV)((data)->pos_min), \ (IV)((data)->pos_delta), \ (UV)((data)->flags) \ ); \ DEBUG_SHOW_STUDY_FLAGS((data)->flags," [ ","]"); \ - Perl_re_printf( aTHX_ \ - " Whilem_c: %"IVdf" Lcp: %"IVdf" %s", \ + Perl_re_printf( aTHX_ \ + " Whilem_c: %" IVdf " Lcp: %" IVdf " %s", \ (IV)((data)->whilem_c), \ (IV)((data)->last_closep ? *((data)->last_closep) : -1), \ is_inf ? "INF " : "" \ ); \ if ((data)->last_found) \ - Perl_re_printf( aTHX_ \ - "Last:'%s' %"IVdf":%"IVdf"/%"IVdf" %sFixed:'%s' @ %"IVdf \ - " %sFloat: '%s' @ %"IVdf"/%"IVdf"", \ + Perl_re_printf( aTHX_ \ + "Last:'%s' %" IVdf ":%" IVdf "/%" IVdf \ + " %sFixed:'%s' @ %" IVdf \ + " %sFloat: '%s' @ %" IVdf "/%" IVdf, \ SvPVX_const((data)->last_found), \ (IV)((data)->last_end), \ (IV)((data)->last_start_min), \ @@ -2012,7 +2013,7 @@ S_dump_trie(pTHX_ const struct _reg_trie_data *trie, HV *widecharmap, for( state = 1 ; state < trie->statecount ; state++ ) { const U32 base = trie->states[ state ].trans.base; - Perl_re_indentf( aTHX_ "#%4"UVXf"|", depth+1, (UV)state); + Perl_re_indentf( aTHX_ "#%4" UVXf "|", depth+1, (UV)state); if ( trie->states[ state ].wordnum ) { Perl_re_printf( aTHX_ " W%4X", trie->states[ state ].wordnum ); @@ -2020,7 +2021,7 @@ S_dump_trie(pTHX_ const struct _reg_trie_data *trie, HV *widecharmap, Perl_re_printf( aTHX_ "%6s", "" ); } - Perl_re_printf( aTHX_ " @%4"UVXf" ", (UV)base ); + Perl_re_printf( aTHX_ " @%4" UVXf " ", (UV)base ); if ( base ) { U32 ofs = 0; @@ -2031,7 +2032,7 @@ S_dump_trie(pTHX_ const struct _reg_trie_data *trie, HV *widecharmap, != state)) ofs++; - Perl_re_printf( aTHX_ "+%2"UVXf"[ ", (UV)ofs); + Perl_re_printf( aTHX_ "+%2" UVXf "[ ", (UV)ofs); for ( ofs = 0 ; ofs < trie->uniquecharcount ; ofs++ ) { if ( ( base + ofs >= trie->uniquecharcount ) @@ -2040,7 +2041,7 @@ S_dump_trie(pTHX_ const struct _reg_trie_data *trie, HV *widecharmap, && trie->trans[ base + ofs - trie->uniquecharcount ].check == state ) { - Perl_re_printf( aTHX_ "%*"UVXf, colwidth, + Perl_re_printf( aTHX_ "%*" UVXf, colwidth, (UV)trie->trans[ base + ofs - trie->uniquecharcount ].next ); } else { @@ -2089,7 +2090,7 @@ S_dump_trie_interim_list(pTHX_ const struct _reg_trie_data *trie, for( state=1 ; state < next_alloc ; state ++ ) { U16 charid; - Perl_re_indentf( aTHX_ " %4"UVXf" :", + Perl_re_indentf( aTHX_ " %4" UVXf " :", depth+1, (UV)state ); if ( ! trie->states[ state ].wordnum ) { Perl_re_printf( aTHX_ "%5s| ",""); @@ -2102,7 +2103,7 @@ S_dump_trie_interim_list(pTHX_ const struct _reg_trie_data *trie, SV ** const tmp = av_fetch( revcharmap, TRIE_LIST_ITEM(state,charid).forid, 0); if ( tmp ) { - Perl_re_printf( aTHX_ "%*s:%3X=%4"UVXf" | ", + Perl_re_printf( aTHX_ "%*s:%3X=%4" UVXf " | ", colwidth, pv_pretty(sv, SvPV_nolen_const(*tmp), SvCUR(*tmp), colwidth, @@ -2173,22 +2174,22 @@ S_dump_trie_interim_table(pTHX_ const struct _reg_trie_data *trie, for( state=1 ; state < next_alloc ; state += trie->uniquecharcount ) { - Perl_re_indentf( aTHX_ "%4"UVXf" : ", + Perl_re_indentf( aTHX_ "%4" UVXf " : ", depth+1, (UV)TRIE_NODENUM( state ) ); for( charid = 0 ; charid < trie->uniquecharcount ; charid++ ) { UV v=(UV)SAFE_TRIE_NODENUM( trie->trans[ state + charid ].next ); if (v) - Perl_re_printf( aTHX_ "%*"UVXf, colwidth, v ); + Perl_re_printf( aTHX_ "%*" UVXf, colwidth, v ); else Perl_re_printf( aTHX_ "%*s", colwidth, "." ); } if ( ! trie->states[ TRIE_NODENUM( state ) ].wordnum ) { - Perl_re_printf( aTHX_ " (%4"UVXf")\n", + Perl_re_printf( aTHX_ " (%4" UVXf ")\n", (UV)trie->trans[ state ].check ); } else { - Perl_re_printf( aTHX_ " (%4"UVXf") W%4X\n", + Perl_re_printf( aTHX_ " (%4" UVXf ") W%4X\n", (UV)trie->trans[ state ].check, trie->states[ TRIE_NODENUM( state ) ].wordnum ); } @@ -2702,7 +2703,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, svpp = hv_fetch( widecharmap, (char*)&uvc, sizeof( UV ), 1 ); if ( !svpp ) - Perl_croak( aTHX_ "error creating/fetching widecharmap entry for 0x%"UVXf, uvc ); + Perl_croak( aTHX_ "error creating/fetching widecharmap entry for 0x%" UVXf, uvc ); if ( !SvTRUE( *svpp ) ) { sv_setiv( *svpp, ++trie->uniquecharcount ); @@ -2846,7 +2847,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, } state = newstate; } else { - Perl_croak( aTHX_ "panic! In trie construction, no char mapping for %"IVdf, uvc ); + Perl_croak( aTHX_ "panic! In trie construction, no char mapping for %" IVdf, uvc ); } } } @@ -3043,7 +3044,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, } state = trie->trans[ state + charid ].next; } else { - Perl_croak( aTHX_ "panic! In trie construction, no char mapping for %"IVdf, uvc ); + Perl_croak( aTHX_ "panic! In trie construction, no char mapping for %" IVdf, uvc ); } /* charid is now 0 if we dont know the char read, or * nonzero if we do */ @@ -3176,7 +3177,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, PerlMemShared_realloc( trie->states, laststate * sizeof(reg_trie_state) ); DEBUG_TRIE_COMPILE_MORE_r( - Perl_re_indentf( aTHX_ "Alloc: %d Orig: %"IVdf" elements, Final:%"IVdf". Savings of %%%5.2f\n", + Perl_re_indentf( aTHX_ "Alloc: %d Orig: %" IVdf " elements, Final:%" IVdf ". Savings of %%%5.2f\n", depth+1, (int)( ( TRIE_CHARCOUNT(trie) + 1 ) * trie->uniquecharcount + 1 ), @@ -3188,7 +3189,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, } /* end table compress */ } DEBUG_TRIE_COMPILE_MORE_r( - Perl_re_indentf( aTHX_ "Statecount:%"UVxf" Lasttrans:%"UVxf"\n", + Perl_re_indentf( aTHX_ "Statecount:%" UVxf " Lasttrans:%" UVxf "\n", depth+1, (UV)trie->statecount, (UV)trie->lasttrans) @@ -3239,7 +3240,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, }); } DEBUG_OPTIMISE_r( - Perl_re_indentf( aTHX_ "MJD offset:%"UVuf" MJD length:%"UVuf"\n", + Perl_re_indentf( aTHX_ "MJD offset:%" UVuf " MJD length:%" UVuf "\n", depth+1, (UV)mjd_offset, (UV)mjd_nodelen) ); @@ -3286,7 +3287,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, /* clear the bitmap */ Zero(trie->bitmap, ANYOF_BITMAP_SIZE, char); DEBUG_OPTIMISE_r( - Perl_re_indentf( aTHX_ "New Start State=%"UVuf" Class: [", + Perl_re_indentf( aTHX_ "New Start State=%" UVuf " Class: [", depth+1, (UV)state)); if (first_ofs >= 0) { @@ -3315,7 +3316,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, char *ch = SvPV( *tmp, len ); DEBUG_OPTIMISE_r({ SV *sv=sv_newmortal(); - Perl_re_indentf( aTHX_ "Prefix State: %"UVuf" Ofs:%"UVuf" Char='%s'\n", + Perl_re_indentf( aTHX_ "Prefix State: %" UVuf " Ofs:%" UVuf " Char='%s'\n", depth+1, (UV)state, (UV)first_ofs, pv_pretty(sv, SvPV_nolen_const(*tmp), SvCUR(*tmp), 6, @@ -3608,11 +3609,11 @@ S_construct_ahocorasick_from_trie(pTHX_ RExC_state_t *pRExC_state, regnode *sour */ fail[ 0 ] = fail[ 1 ] = 0; DEBUG_TRIE_COMPILE_r({ - Perl_re_indentf( aTHX_ "Stclass Failtable (%"UVuf" states): 0", + Perl_re_indentf( aTHX_ "Stclass Failtable (%" UVuf " states): 0", depth, (UV)numstates ); for( q_read=1; q_read<numstates; q_read++ ) { - Perl_re_printf( aTHX_ ", %"UVuf, (UV)fail[q_read]); + Perl_re_printf( aTHX_ ", %" UVuf, (UV)fail[q_read]); } Perl_re_printf( aTHX_ "\n"); }); @@ -4451,7 +4452,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, DEBUG_TRIE_COMPILE_r({ regprop(RExC_rx, RExC_mysv, tail, NULL, pRExC_state); - Perl_re_indentf( aTHX_ "%s %"UVuf":%s\n", + Perl_re_indentf( aTHX_ "%s %" UVuf ":%s\n", depth+1, "Looking for TRIE'able sequences. Tail node is ", (UV)(tail - RExC_emit_start), @@ -5088,7 +5089,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, SAVEFREESV(RExC_rx_sv); Perl_ck_warner(aTHX_ packWARN(WARN_REGEXP), "Quantifier unexpected on zero-length expression " - "in regex m/%"UTF8f"/", + "in regex m/%" UTF8f "/", UTF8fARG(UTF, RExC_precomp_end - RExC_precomp, RExC_precomp)); (void)ReREFCNT_inc(RExC_rx_sv); @@ -5284,13 +5285,13 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, /* It is counted once already... */ data->pos_min += minnext * (mincount - counted); #if 0 -Perl_re_printf( aTHX_ "counted=%"UVuf" deltanext=%"UVuf - " SSize_t_MAX=%"UVuf" minnext=%"UVuf - " maxcount=%"UVuf" mincount=%"UVuf"\n", +Perl_re_printf( aTHX_ "counted=%" UVuf " deltanext=%" UVuf + " SSize_t_MAX=%" UVuf " minnext=%" UVuf + " maxcount=%" UVuf " mincount=%" UVuf "\n", (UV)counted, (UV)deltanext, (UV)SSize_t_MAX, (UV)minnext, (UV)maxcount, (UV)mincount); if (deltanext != SSize_t_MAX) -Perl_re_printf( aTHX_ "LHS=%"UVuf" RHS=%"UVuf"\n", +Perl_re_printf( aTHX_ "LHS=%" UVuf " RHS=%" UVuf "\n", (UV)(-counted * deltanext + (minnext + deltanext) * maxcount - minnext * mincount), (UV)(SSize_t_MAX - data->pos_delta)); #endif @@ -5595,7 +5596,7 @@ Perl_re_printf( aTHX_ "LHS=%"UVuf" RHS=%"UVuf"\n", FAIL("Variable length lookbehind not implemented"); } else if (minnext > (I32)U8_MAX) { - FAIL2("Lookbehind longer than %"UVuf" not implemented", + FAIL2("Lookbehind longer than %" UVuf " not implemented", (UV)U8_MAX); } scan->flags = (U8)minnext; @@ -5684,7 +5685,7 @@ Perl_re_printf( aTHX_ "LHS=%"UVuf" RHS=%"UVuf"\n", FAIL("Variable length lookbehind not implemented"); } else if (*minnextp > (I32)U8_MAX) { - FAIL2("Lookbehind longer than %"UVuf" not implemented", + FAIL2("Lookbehind longer than %" UVuf " not implemented", (UV)U8_MAX); } scan->flags = (U8)*minnextp; @@ -6098,7 +6099,7 @@ Perl_pregcomp(pTHX_ SV * const pattern, const U32 flags) /* Dispatch a request to compile a regexp to correct regexp engine. */ DEBUG_COMPILE_r({ - Perl_re_printf( aTHX_ "Using engine %"UVxf"\n", + Perl_re_printf( aTHX_ "Using engine %" UVxf "\n", PTR2UV(eng)); }); return CALLREGCOMP_ENG(eng, pattern, flags); @@ -6549,7 +6550,7 @@ S_compile_runtime_code(pTHX_ RExC_state_t * const pRExC_state, { Safefree(pRExC_state->code_blocks); /* use croak_sv ? */ - Perl_croak_nocontext("%"SVf, SVfARG(errsv)); + Perl_croak_nocontext("%" SVf, SVfARG(errsv)); } } assert(SvROK(qr_ref)); @@ -7088,14 +7089,14 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, goto redo_first_pass; } - Perl_croak(aTHX_ "panic: reg returned NULL to re_op_compile for sizing pass, flags=%#"UVxf"", (UV) flags); + Perl_croak(aTHX_ "panic: reg returned NULL to re_op_compile for sizing pass, flags=%#" UVxf, (UV) flags); } if (code_blocksv) SvLEN_set(code_blocksv,0); /* no you can't have it, sv_clear */ DEBUG_PARSE_r({ Perl_re_printf( aTHX_ - "Required size %"IVdf" nodes\n" + "Required size %" IVdf " nodes\n" "Starting second pass (creation)\n", (IV)RExC_size); RExC_lastnum=0; @@ -7233,7 +7234,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, #ifdef RE_TRACK_PATTERN_OFFSETS Newxz(ri->u.offsets, 2*RExC_size+1, U32); /* MJD 20001228 */ DEBUG_OFFSETS_r(Perl_re_printf( aTHX_ - "%s %"UVuf" bytes for offset annotations.\n", + "%s %" UVuf " bytes for offset annotations.\n", ri->u.offsets ? "Got" : "Couldn't get", (UV)((2*RExC_size+1) * sizeof(U32)))); #endif @@ -7287,7 +7288,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, RExC_npar = 1; if (reg(pRExC_state, 0, &flags,1) == NULL) { ReREFCNT_dec(rx); - Perl_croak(aTHX_ "panic: reg returned NULL to re_op_compile for generation pass, flags=%#"UVxf"", (UV) flags); + Perl_croak(aTHX_ "panic: reg returned NULL to re_op_compile for generation pass, flags=%#" UVxf, (UV) flags); } DEBUG_OPTIMISE_r( Perl_re_printf( aTHX_ "Starting post parse optimization\n"); @@ -7453,12 +7454,12 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, #ifdef TRIE_STUDY_OPT DEBUG_PARSE_r( if (!restudied) - Perl_re_printf( aTHX_ "first at %"IVdf"\n", + Perl_re_printf( aTHX_ "first at %" IVdf "\n", (IV)(first - scan + 1)) ); #else DEBUG_PARSE_r( - Perl_re_printf( aTHX_ "first at %"IVdf"\n", + Perl_re_printf( aTHX_ "first at %" IVdf "\n", (IV)(first - scan + 1)) ); #endif @@ -7685,7 +7686,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, /* Guard against an embedded (?=) or (?<=) with a longer minlen than the "real" pattern. */ DEBUG_OPTIMISE_r({ - Perl_re_printf( aTHX_ "minlen: %"IVdf" r->minlen:%"IVdf" maxlen:%"IVdf"\n", + Perl_re_printf( aTHX_ "minlen: %" IVdf " r->minlen:%" IVdf " maxlen:%" IVdf "\n", (IV)minlen, (IV)r->minlen, (IV)RExC_maxlen); }); r->minlenret = minlen; @@ -7793,10 +7794,10 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, STRLEN i; GET_RE_DEBUG_FLAGS_DECL; Perl_re_printf( aTHX_ - "Offsets: [%"UVuf"]\n\t", (UV)ri->u.offsets[0]); + "Offsets: [%" UVuf "]\n\t", (UV)ri->u.offsets[0]); for (i = 1; i <= len; i++) { if (ri->u.offsets[i*2-1] || ri->u.offsets[i*2]) - Perl_re_printf( aTHX_ "%"UVuf":%"UVuf"[%"UVuf"] ", + Perl_re_printf( aTHX_ "%" UVuf ":%" UVuf "[%" UVuf "] ", (UV)i, (UV)ri->u.offsets[i*2-1], (UV)ri->u.offsets[i*2]); } Perl_re_printf( aTHX_ "\n"); @@ -8731,7 +8732,7 @@ S__append_range_to_invlist(pTHX_ SV* const invlist, if ( array[final_element] > start || ELEMENT_RANGE_MATCHES_INVLIST(final_element)) { - Perl_croak(aTHX_ "panic: attempting to append to an inversion list, but wasn't at the end of the list, final=%"UVuf", start=%"UVuf", match=%c", + Perl_croak(aTHX_ "panic: attempting to append to an inversion list, but wasn't at the end of the list, final=%" UVuf ", start=%" UVuf ", match=%c", array[final_element], start, ELEMENT_RANGE_MATCHES_INVLIST(final_element) ? 't' : 'f'); } @@ -9960,18 +9961,18 @@ S_invlist_contents(pTHX_ SV* const invlist, const bool traditional_style) invlist_iterinit(invlist); while (invlist_iternext(invlist, &start, &end)) { if (end == UV_MAX) { - Perl_sv_catpvf(aTHX_ output, "%04"UVXf"%cINFINITY%c", + Perl_sv_catpvf(aTHX_ output, "%04" UVXf "%cINFINITY%c", start, intra_range_delimiter, inter_range_delimiter); } else if (end != start) { - Perl_sv_catpvf(aTHX_ output, "%04"UVXf"%c%04"UVXf"%c", + Perl_sv_catpvf(aTHX_ output, "%04" UVXf "%c%04" UVXf "%c", start, intra_range_delimiter, end, inter_range_delimiter); } else { - Perl_sv_catpvf(aTHX_ output, "%04"UVXf"%c", + Perl_sv_catpvf(aTHX_ output, "%04" UVXf "%c", start, inter_range_delimiter); } } @@ -10018,16 +10019,16 @@ Perl__invlist_dump(pTHX_ PerlIO *file, I32 level, while (invlist_iternext(invlist, &start, &end)) { if (end == UV_MAX) { Perl_dump_indent(aTHX_ level, file, - "%s[%"UVuf"] 0x%04"UVXf" .. INFINITY\n", + "%s[%" UVuf "] 0x%04" UVXf " .. INFINITY\n", indent, (UV)count, start); } else if (end != start) { Perl_dump_indent(aTHX_ level, file, - "%s[%"UVuf"] 0x%04"UVXf" .. 0x%04"UVXf"\n", + "%s[%" UVuf "] 0x%04" UVXf " .. 0x%04" UVXf "\n", indent, (UV)count, start, end); } else { - Perl_dump_indent(aTHX_ level, file, "%s[%"UVuf"] 0x%04"UVXf"\n", + Perl_dump_indent(aTHX_ level, file, "%s[%" UVuf "] 0x%04" UVXf "\n", indent, (UV)count, start); } count += 2; @@ -10465,7 +10466,7 @@ S_parse_lparen_question_flags(pTHX_ RExC_state_t *pRExC_state) fail_modifiers: RExC_parse += SKIP_IF_CHAR(RExC_parse); /* diag_listed_as: Sequence (?%s...) not recognized in regex; marked by <-- HERE in m/%s/ */ - vFAIL2utf8f("Sequence (%"UTF8f"...) not recognized", + vFAIL2utf8f("Sequence (%" UTF8f "...) not recognized", UTF8fARG(UTF, RExC_parse-seqstart, seqstart)); NOT_REACHED; /*NOTREACHED*/ } @@ -10677,7 +10678,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) if ( ! op ) { RExC_parse += UTF ? UTF8SKIP(RExC_parse) : 1; vFAIL2utf8f( - "Unknown verb pattern '%"UTF8f"'", + "Unknown verb pattern '%" UTF8f "'", UTF8fARG(UTF, verb_len, start_verb)); } if ( arg_required && !start_arg ) { @@ -10974,7 +10975,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) } RExC_recurse_count++; DEBUG_OPTIMISE_MORE_r(Perl_re_printf( aTHX_ - "%*s%*s Recurse #%"UVuf" to %"IVdf"\n", + "%*s%*s Recurse #%" UVuf " to %" IVdf "\n", 22, "| |", (int)(depth * 2 + 1), "", (UV)ARG(ret), (IV)ARG2L(ret))); } @@ -10996,7 +10997,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) RExC_parse += SKIP_IF_CHAR(RExC_parse); /* diag_listed_as: Sequence (?%s...) not recognized in regex; marked by <-- HERE in m/%s/ */ vFAIL2utf8f( - "Sequence (%"UTF8f"...) not recognized", + "Sequence (%" UTF8f "...) not recognized", UTF8fARG(UTF, RExC_parse-seqstart, seqstart)); NOT_REACHED; /*NOTREACHED*/ } @@ -11198,7 +11199,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) *flagp = flags & (RESTART_PASS1|NEED_UTF8); return NULL; } - FAIL2("panic: regbranch returned NULL, flags=%#"UVxf"", + FAIL2("panic: regbranch returned NULL, flags=%#" UVxf, (UV) flags); } else REGTAIL(pRExC_state, br, reganode(pRExC_state, @@ -11219,7 +11220,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) *flagp = flags & (RESTART_PASS1|NEED_UTF8); return NULL; } - FAIL2("panic: regbranch returned NULL, flags=%#"UVxf"", + FAIL2("panic: regbranch returned NULL, flags=%#" UVxf, (UV) flags); } REGTAIL(pRExC_state, ret, lastbr); @@ -11287,7 +11288,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) if (RExC_open_parens && !RExC_open_parens[parno]) { DEBUG_OPTIMISE_MORE_r(Perl_re_printf( aTHX_ - "%*s%*s Setting open paren #%"IVdf" to %d\n", + "%*s%*s Setting open paren #%" IVdf " to %d\n", 22, "| |", (int)(depth * 2 + 1), "", (IV)parno, REG_NODE_NUM(ret))); RExC_open_parens[parno]= ret; @@ -11317,7 +11318,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) *flagp = flags & (RESTART_PASS1|NEED_UTF8); return NULL; } - FAIL2("panic: regbranch returned NULL, flags=%#"UVxf"", (UV) flags); + FAIL2("panic: regbranch returned NULL, flags=%#" UVxf, (UV) flags); } if (*RExC_parse == '|') { if (!SIZE_ONLY && RExC_extralen) { @@ -11364,7 +11365,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) *flagp = flags & (RESTART_PASS1|NEED_UTF8); return NULL; } - FAIL2("panic: regbranch returned NULL, flags=%#"UVxf"", (UV) flags); + FAIL2("panic: regbranch returned NULL, flags=%#" UVxf, (UV) flags); } REGTAIL(pRExC_state, lastbr, br); /* BRANCH -> BRANCH. */ lastbr = br; @@ -11381,7 +11382,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) ender = reganode(pRExC_state, CLOSE, parno); if ( RExC_close_parens ) { DEBUG_OPTIMISE_MORE_r(Perl_re_printf( aTHX_ - "%*s%*s Setting close paren #%"IVdf" to %d\n", + "%*s%*s Setting close paren #%" IVdf " to %d\n", 22, "| |", (int)(depth * 2 + 1), "", (IV)parno, REG_NODE_NUM(ender))); RExC_close_parens[parno]= ender; if (RExC_nestroot == parno) @@ -11418,7 +11419,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) DEBUG_PARSE_MSG("lsbr"); regprop(RExC_rx, RExC_mysv1, lastbr, NULL, pRExC_state); regprop(RExC_rx, RExC_mysv2, ender, NULL, pRExC_state); - Perl_re_printf( aTHX_ "~ tying lastbr %s (%"IVdf") to ender %s (%"IVdf") offset %"IVdf"\n", + Perl_re_printf( aTHX_ "~ tying lastbr %s (%" IVdf ") to ender %s (%" IVdf ") offset %" IVdf "\n", SvPV_nolen_const(RExC_mysv1), (IV)REG_NODE_NUM(lastbr), SvPV_nolen_const(RExC_mysv2), @@ -11457,7 +11458,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth) DEBUG_PARSE_MSG("NADA"); regprop(RExC_rx, RExC_mysv1, ret, NULL, pRExC_state); regprop(RExC_rx, RExC_mysv2, ender, NULL, pRExC_state); - Perl_re_printf( aTHX_ "~ converting ret %s (%"IVdf") to ender %s (%"IVdf") offset %"IVdf"\n", + Perl_re_printf( aTHX_ "~ converting ret %s (%" IVdf ") to ender %s (%" IVdf ") offset %" IVdf "\n", SvPV_nolen_const(RExC_mysv1), (IV)REG_NODE_NUM(ret), SvPV_nolen_const(RExC_mysv2), @@ -11578,7 +11579,7 @@ S_regbranch(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, I32 first, U32 depth) *flagp = flags & (RESTART_PASS1|NEED_UTF8); return NULL; } - FAIL2("panic: regpiece returned NULL, flags=%#"UVxf"", (UV) flags); + FAIL2("panic: regpiece returned NULL, flags=%#" UVxf, (UV) flags); } else if (ret == NULL) ret = latest; @@ -11650,7 +11651,7 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) if (flags & (TRYAGAIN|RESTART_PASS1|NEED_UTF8)) *flagp |= flags & (TRYAGAIN|RESTART_PASS1|NEED_UTF8); else - FAIL2("panic: regatom returned NULL, flags=%#"UVxf"", (UV) flags); + FAIL2("panic: regatom returned NULL, flags=%#" UVxf, (UV) flags); return(NULL); } @@ -11831,7 +11832,7 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) if (!SIZE_ONLY && !(flags&(HASWIDTH|POSTPONED)) && max > REG_INFTY/3) { SAVEFREESV(RExC_rx_sv); /* in case of fatal warnings */ ckWARN2reg(RExC_parse, - "%"UTF8f" matches null string many times", + "%" UTF8f " matches null string many times", UTF8fARG(UTF, (RExC_parse >= origparse ? RExC_parse - origparse : 0), @@ -12170,7 +12171,7 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pRExC_state, *flagp = flags & (RESTART_PASS1|NEED_UTF8); return FALSE; } - FAIL2("panic: reg returned NULL to grok_bslash_N, flags=%#"UVxf"", + FAIL2("panic: reg returned NULL to grok_bslash_N, flags=%#" UVxf, (UV) flags); } *flagp |= flags&(HASWIDTH|SPSTART|SIMPLE|POSTPONED); @@ -12536,7 +12537,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) if (ret == NULL) { if (*flagp & (RESTART_PASS1|NEED_UTF8)) return NULL; - FAIL2("panic: regclass returned NULL to regatom, flags=%#"UVxf"", + FAIL2("panic: regclass returned NULL to regatom, flags=%#" UVxf, (UV) *flagp); } if (*RExC_parse != ']') { @@ -12563,7 +12564,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) *flagp = flags & (RESTART_PASS1|NEED_UTF8); return NULL; } - FAIL2("panic: reg returned NULL to regatom, flags=%#"UVxf"", + FAIL2("panic: reg returned NULL to regatom, flags=%#" UVxf, (UV) flags); } *flagp |= flags&(HASWIDTH|SPSTART|SIMPLE|POSTPONED); @@ -12726,7 +12727,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) bad_bound_type: RExC_parse = endbrace; vFAIL2utf8f( - "'%"UTF8f"' is an unknown bound type", + "'%" UTF8f "' is an unknown bound type", UTF8fARG(UTF, length, endbrace - length)); NOT_REACHED; /*NOTREACHED*/ } @@ -12844,7 +12845,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) /* regclass() can only return RESTART_PASS1 and NEED_UTF8 if * multi-char folds are allowed. */ if (!ret) - FAIL2("panic: regclass returned NULL to regatom, flags=%#"UVxf"", + FAIL2("panic: regclass returned NULL to regatom, flags=%#" UVxf, (UV) *flagp); RExC_parse--; @@ -14676,7 +14677,7 @@ S_handle_possible_posix(pTHX_ RExC_state_t *pRExC_state, ? "^" : ""; RExC_parse = (char *) p; - vFAIL3utf8f("POSIX class [:%s%"UTF8f":] unknown", + vFAIL3utf8f("POSIX class [:%s%" UTF8f ":] unknown", complement_string, UTF8fARG(UTF, RExC_parse - name_start - 2, name_start)); } @@ -14819,7 +14820,7 @@ S_handle_regex_sets(pTHX_ RExC_state_t *pRExC_state, SV** return_invlist, &posix_warnings )) FAIL2("panic: regclass returned NULL to handle_sets, " - "flags=%#"UVxf"", (UV) *flagp); + "flags=%#" UVxf, (UV) *flagp); /* function call leaves parse pointing to the ']', except * if we faked it */ @@ -15088,7 +15089,7 @@ redo_curchar: NULL)) { FAIL2("panic: regclass returned NULL to handle_sets, " - "flags=%#"UVxf"", (UV) *flagp); + "flags=%#" UVxf, (UV) *flagp); } /* regclass() will return with parsing just the \ sequence, @@ -15127,7 +15128,7 @@ redo_curchar: )) { FAIL2("panic: regclass returned NULL to handle_sets, " - "flags=%#"UVxf"", (UV) *flagp); + "flags=%#" UVxf, (UV) *flagp); } /* function call leaves parse pointing to the ']', except if we @@ -15423,10 +15424,10 @@ redo_curchar: result_string = newSVpvs(""); while (invlist_iternext(final, &start, &end)) { if (start == end) { - Perl_sv_catpvf(aTHX_ result_string, "\\x{%"UVXf"}", start); + Perl_sv_catpvf(aTHX_ result_string, "\\x{%" UVXf "}", start); } else { - Perl_sv_catpvf(aTHX_ result_string, "\\x{%"UVXf"}-\\x{%"UVXf"}", + Perl_sv_catpvf(aTHX_ result_string, "\\x{%" UVXf "}-\\x{%" UVXf "}", start, end); } } @@ -15456,7 +15457,7 @@ redo_curchar: NULL ); if (!node) - FAIL2("panic: regclass returned NULL to handle_sets, flags=%#"UVxf, + FAIL2("panic: regclass returned NULL to handle_sets, flags=%#" UVxf, PTR2UV(flagp)); /* Fix up the node type if we are in locale. (We have pretended we are @@ -16285,7 +16286,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, RExC_parse = e + 1; /* diag_listed_as: Can't find Unicode property definition "%s" */ - vFAIL3utf8f("%s \"%"UTF8f"\"", + vFAIL3utf8f("%s \"%" UTF8f "\"", msg, UTF8fARG(UTF, n, name)); } @@ -16304,7 +16305,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, SAVEFREEPV(name); } } - Perl_sv_catpvf(aTHX_ listsv, "%cutf8::%s%"UTF8f"%s\n", + Perl_sv_catpvf(aTHX_ listsv, "%cutf8::%s%" UTF8f "%s\n", (value == 'p' ? '+' : '!'), (FOLD) ? "__" : "", UTF8fARG(UTF, n, name), @@ -16474,13 +16475,13 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, : 0; if (strict) { vFAIL2utf8f( - "False [] range \"%"UTF8f"\"", + "False [] range \"%" UTF8f "\"", UTF8fARG(UTF, w, rangebegin)); } else { SAVEFREESV(RExC_rx_sv); /* in case of fatal warnings */ ckWARN2reg(RExC_parse, - "False [] range \"%"UTF8f"\"", + "False [] range \"%" UTF8f "\"", UTF8fARG(UTF, w, rangebegin)); (void)ReREFCNT_inc(RExC_rx_sv); cp_list = add_cp_to_invlist(cp_list, '-'); @@ -16668,7 +16669,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, #endif w = RExC_parse - rangebegin; vFAIL2utf8f( - "Invalid [] range \"%"UTF8f"\"", + "Invalid [] range \"%" UTF8f "\"", UTF8fARG(UTF, w, rangebegin)); NOT_REACHED; /* NOTREACHED */ } @@ -16773,7 +16774,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, foldbuf + foldlen); SV* multi_fold = sv_2mortal(newSVpvs("")); - Perl_sv_catpvf(aTHX_ multi_fold, "\\x{%"UVXf"}", value); + Perl_sv_catpvf(aTHX_ multi_fold, "\\x{%" UVXf "}", value); multi_char_matches = add_multi_match(multi_char_matches, @@ -18377,7 +18378,7 @@ S_regnode_guts(pTHX_ RExC_state_t *pRExC_state, const U8 op, const STRLEN extra_ #else if (RExC_offsets) { /* MJD */ MJD_OFFSET_DEBUG( - ("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", + ("%s:%d: (op %s) %s %" UVuf " (len %" UVuf ") (max %" UVuf ").\n", name, __LINE__, PL_reg_name[op], (UV)(RExC_emit - RExC_emit_start) > RExC_offsets[0] @@ -18482,7 +18483,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth) dst = RExC_emit; if (RExC_open_parens) { int paren; - /*DEBUG_PARSE_FMT("inst"," - %"IVdf, (IV)RExC_npar);*/ + /*DEBUG_PARSE_FMT("inst"," - %" IVdf, (IV)RExC_npar);*/ /* remember that RExC_npar is rex->nparens + 1, * iow it is 1 more than the number of parens seen in * the pattern so far. */ @@ -18512,7 +18513,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth) #ifdef RE_TRACK_PATTERN_OFFSETS if (RExC_offsets) { /* MJD 20010112 */ MJD_OFFSET_DEBUG( - ("%s(%d): (op %s) %s copy %"UVuf" -> %"UVuf" (max %"UVuf").\n", + ("%s(%d): (op %s) %s copy %" UVuf " -> %" UVuf " (max %" UVuf ").\n", "reg_insert", __LINE__, PL_reg_name[op], @@ -18532,7 +18533,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth) #ifdef RE_TRACK_PATTERN_OFFSETS if (RExC_offsets) { /* MJD */ MJD_OFFSET_DEBUG( - ("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", + ("%s(%d): (op %s) %s %" UVuf " <- %" UVuf " (max %" UVuf ").\n", "reginsert", __LINE__, PL_reg_name[op], @@ -18681,7 +18682,7 @@ S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode *p, DEBUG_PARSE_MSG(""); regprop(RExC_rx, RExC_mysv, val, NULL, pRExC_state); Perl_re_printf( aTHX_ - "~ attach to %s (%"IVdf") offset to %"IVdf"\n", + "~ attach to %s (%" IVdf ") offset to %" IVdf "\n", SvPV_nolen_const(RExC_mysv), (IV)REG_NODE_NUM(val), (IV)(val - scan) @@ -18794,14 +18795,14 @@ Perl_regdump(pTHX_ const regexp *r) RE_PV_QUOTED_DECL(s, 0, dsv, SvPVX_const(r->anchored_substr), RE_SV_DUMPLEN(r->anchored_substr), 30); Perl_re_printf( aTHX_ - "anchored %s%s at %"IVdf" ", + "anchored %s%s at %" IVdf " ", s, RE_SV_TAIL(r->anchored_substr), (IV)r->anchored_offset); } else if (r->anchored_utf8) { RE_PV_QUOTED_DECL(s, 1, dsv, SvPVX_const(r->anchored_utf8), RE_SV_DUMPLEN(r->anchored_utf8), 30); Perl_re_printf( aTHX_ - "anchored utf8 %s%s at %"IVdf" ", + "anchored utf8 %s%s at %" IVdf " ", s, RE_SV_TAIL(r->anchored_utf8), (IV)r->anchored_offset); } @@ -18809,14 +18810,14 @@ Perl_regdump(pTHX_ const regexp *r) RE_PV_QUOTED_DECL(s, 0, dsv, SvPVX_const(r->float_substr), RE_SV_DUMPLEN(r->float_substr), 30); Perl_re_printf( aTHX_ - "floating %s%s at %"IVdf"..%"UVuf" ", + "floating %s%s at %" IVdf "..%" UVuf " ", s, RE_SV_TAIL(r->float_substr), (IV)r->float_min_offset, (UV)r->float_max_offset); } else if (r->float_utf8) { RE_PV_QUOTED_DECL(s, 1, dsv, SvPVX_const(r->float_utf8), RE_SV_DUMPLEN(r->float_utf8), 30); Perl_re_printf( aTHX_ - "floating utf8 %s%s at %"IVdf"..%"UVuf" ", + "floating utf8 %s%s at %" IVdf "..%" UVuf " ", s, RE_SV_TAIL(r->float_utf8), (IV)r->float_min_offset, (UV)r->float_max_offset); } @@ -18848,12 +18849,12 @@ Perl_regdump(pTHX_ const regexp *r) Perl_re_printf( aTHX_ " "); } if (r->intflags & PREGf_GPOS_SEEN) - Perl_re_printf( aTHX_ "GPOS:%"UVuf" ", (UV)r->gofs); + Perl_re_printf( aTHX_ "GPOS:%" UVuf " ", (UV)r->gofs); if (r->intflags & PREGf_SKIP) Perl_re_printf( aTHX_ "plus "); if (r->intflags & PREGf_IMPLICIT) Perl_re_printf( aTHX_ "implicit "); - Perl_re_printf( aTHX_ "minlen %"IVdf" ", (IV)r->minlen); + Perl_re_printf( aTHX_ "minlen %" IVdf " ", (IV)r->minlen); if (r->extflags & RXf_EVAL_SEEN) Perl_re_printf( aTHX_ "with eval "); Perl_re_printf( aTHX_ "\n"); @@ -18969,7 +18970,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_ if (trie->jump) sv_catpvs(sv, "(JUMP)"); Perl_sv_catpvf(aTHX_ sv, - "<S:%"UVuf"/%"IVdf" W:%"UVuf" L:%"UVuf"/%"UVuf" C:%"UVuf"/%"UVuf">", + "<S:%" UVuf "/%" IVdf " W:%" UVuf " L:%" UVuf "/%" UVuf " C:%" UVuf "/%" UVuf ">", (UV)trie->startstate, (IV)trie->statecount-1, /* -1 because of the unused 0 element */ (UV)trie->wordcount, @@ -19010,7 +19011,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_ { AV *name_list= NULL; U32 parno= OP(o) == ACCEPT ? (U32)ARG2L(o) : ARG(o); - Perl_sv_catpvf(aTHX_ sv, "%"UVuf, (UV)parno); /* Parenth number */ + Perl_sv_catpvf(aTHX_ sv, "%" UVuf, (UV)parno); /* Parenth number */ if ( RXp_PAREN_NAMES(prog) ) { name_list= MUTABLE_AV(progi->data->data[progi->name_list_idx]); } else if ( pRExC_state ) { @@ -19020,7 +19021,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_ if ( k != REF || (OP(o) < NREF)) { SV **name= av_fetch(name_list, parno, 0 ); if (name) - Perl_sv_catpvf(aTHX_ sv, " '%"SVf"'", SVfARG(*name)); + Perl_sv_catpvf(aTHX_ sv, " '%" SVf "'", SVfARG(*name)); } else { SV *sv_dat= MUTABLE_SV(progi->data->data[ parno ]); @@ -19029,10 +19030,10 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_ I32 n; if (name) { for ( n=0; n<SvIVX(sv_dat); n++ ) { - Perl_sv_catpvf(aTHX_ sv, "%s%"IVdf, + Perl_sv_catpvf(aTHX_ sv, "%s%" IVdf, (n ? "," : ""), (IV)nums[n]); } - Perl_sv_catpvf(aTHX_ sv, " '%"SVf"'", SVfARG(*name)); + Perl_sv_catpvf(aTHX_ sv, " '%" SVf "'", SVfARG(*name)); } } } @@ -19064,7 +19065,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_ if (name_list) { SV **name= av_fetch(name_list, ARG(o), 0 ); if (name) - Perl_sv_catpvf(aTHX_ sv, " '%"SVf"'", SVfARG(*name)); + Perl_sv_catpvf(aTHX_ sv, " '%" SVf "'", SVfARG(*name)); } } else if (k == LOGICAL) @@ -19257,7 +19258,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_ /* add on the verb argument if there is one */ if ( ( k == VERB || OP(o) == ACCEPT || OP(o) == OPFAIL ) && o->flags) { - Perl_sv_catpvf(aTHX_ sv, ":%"SVf, + Perl_sv_catpvf(aTHX_ sv, ":%" SVf, SVfARG((MUTABLE_SV(progi->data->data[ ARG( o ) ])))); } #else @@ -19838,7 +19839,7 @@ S_re_croak2(pTHX_ bool utf8, const char* pat1,const char* pat2,...) l1 = 512; Copy(message, buf, l1 , char); /* l1-1 to avoid \n */ - Perl_croak(aTHX_ "%"UTF8f, UTF8fARG(utf8, l1-1, buf)); + Perl_croak(aTHX_ "%" UTF8f, UTF8fARG(utf8, l1-1, buf)); } /* XXX Here's a total kludge. But we need to re-enter for swash routines. */ @@ -19890,7 +19891,7 @@ S_put_code_point(pTHX_ SV *sv, UV c) PERL_ARGS_ASSERT_PUT_CODE_POINT; if (c > 255) { - Perl_sv_catpvf(aTHX_ sv, "\\x{%04"UVXf"}", c); + Perl_sv_catpvf(aTHX_ sv, "\\x{%04" UVXf "}", c); } else if (isPRINT(c)) { const char string = (char) c; @@ -20074,10 +20075,10 @@ S_put_range(pTHX_ SV *sv, UV start, const UV end, const bool allow_literals) : NUM_ANYOF_CODE_POINTS - 1; #if NUM_ANYOF_CODE_POINTS > 256 format = (this_end < 256) - ? "\\x%02"UVXf"-\\x%02"UVXf"" - : "\\x{%04"UVXf"}-\\x{%04"UVXf"}"; + ? "\\x%02" UVXf "-\\x%02" UVXf + : "\\x{%04" UVXf "}-\\x{%04" UVXf "}"; #else - format = "\\x%02"UVXf"-\\x%02"UVXf""; + format = "\\x%02" UVXf "-\\x%02" UVXf; #endif GCC_DIAG_IGNORE(-Wformat-nonliteral); Perl_sv_catpvf(aTHX_ sv, format, start, this_end); @@ -20479,7 +20480,7 @@ S_put_charclass_bitmap_innards(pTHX_ SV *sv, #define CLEAR_OPTSTART \ if (optstart) STMT_START { \ DEBUG_OPTIMISE_r(Perl_re_printf( aTHX_ \ - " (%"IVdf" nodes)\n", (IV)(node - optstart))); \ + " (%" IVdf " nodes)\n", (IV)(node - optstart))); \ optstart=NULL; \ } STMT_END @@ -20528,7 +20529,7 @@ S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, CLEAR_OPTSTART; regprop(r, sv, node, NULL, NULL); - Perl_re_printf( aTHX_ "%4"IVdf":%*s%s", (IV)(node - start), + Perl_re_printf( aTHX_ "%4" IVdf ":%*s%s", (IV)(node - start), (int)(2*indent + 1), "", SvPVX_const(sv)); if (OP(node) != OPTIMIZED) { @@ -20538,7 +20539,7 @@ S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, && PL_regkind[OP(next)] != BRANCH ) Perl_re_printf( aTHX_ " (FAIL)"); else - Perl_re_printf( aTHX_ " (%"IVdf")", (IV)(next - start)); + Perl_re_printf( aTHX_ " (%" IVdf ")", (IV)(next - start)); Perl_re_printf( aTHX_ "\n"); } @@ -20593,7 +20594,7 @@ S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, ); if (trie->jump) { U16 dist= trie->jump[word_idx+1]; - Perl_re_printf( aTHX_ "(%"UVuf")\n", + Perl_re_printf( aTHX_ "(%" UVuf ")\n", (UV)((dist ? this_trie + dist : next) - start)); if (dist) { if (!nextbranch) @@ -290,7 +290,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen _pDEPTH) (int)parenfloor, (unsigned)REGCP_PAREN_ELEMS); if ((elems_shifted >> SAVE_TIGHT_SHIFT) != total_elems) - Perl_croak(aTHX_ "panic: paren_elems_to_push offset %"UVuf + Perl_croak(aTHX_ "panic: paren_elems_to_push offset %" UVuf " out of range (%lu-%ld)", total_elems, (unsigned long)maxopenparen, @@ -301,7 +301,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen _pDEPTH) DEBUG_BUFFERS_r( if ((int)maxopenparen > (int)parenfloor) Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" offs=0x%"UVxf": saving capture indices:\n", + "rex=0x%" UVxf " offs=0x%" UVxf ": saving capture indices:\n", depth, PTR2UV(rex), PTR2UV(rex->offs) @@ -313,7 +313,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen _pDEPTH) SSPUSHIV(rex->offs[p].start); SSPUSHINT(rex->offs[p].start_tmp); DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ - " \\%"UVuf": %"IVdf"(%"IVdf")..%"IVdf"\n", + " \\%" UVuf ": %" IVdf "(%" IVdf ")..%" IVdf "\n", depth, (UV)p, (IV)rex->offs[p].start, @@ -333,8 +333,8 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen _pDEPTH) /* These are needed since we do not localize EVAL nodes: */ #define REGCP_SET(cp) \ DEBUG_STATE_r( \ - Perl_re_exec_indentf( aTHX_ \ - "Setting an EVAL scope, savestack=%"IVdf",\n", \ + Perl_re_exec_indentf( aTHX_ \ + "Setting an EVAL scope, savestack=%" IVdf ",\n", \ depth, (IV)PL_savestack_ix \ ) \ ); \ @@ -343,8 +343,9 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen _pDEPTH) #define REGCP_UNWIND(cp) \ DEBUG_STATE_r( \ if (cp != PL_savestack_ix) \ - Perl_re_exec_indentf( aTHX_ \ - "Clearing an EVAL scope, savestack=%"IVdf"..%"IVdf"\n",\ + Perl_re_exec_indentf( aTHX_ \ + "Clearing an EVAL scope, savestack=%" \ + IVdf "..%" IVdf "\n", \ depth, (IV)(cp), (IV)PL_savestack_ix \ ) \ ); \ @@ -379,7 +380,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p _pDEPTH) DEBUG_BUFFERS_r( if (i || rex->lastparen + 1 <= rex->nparens) Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" offs=0x%"UVxf": restoring capture indices to:\n", + "rex=0x%" UVxf " offs=0x%" UVxf ": restoring capture indices to:\n", depth, PTR2UV(rex), PTR2UV(rex->offs) @@ -394,7 +395,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p _pDEPTH) if (paren <= rex->lastparen) rex->offs[paren].end = tmps; DEBUG_BUFFERS_r( Perl_re_exec_indentf( aTHX_ - " \\%"UVuf": %"IVdf"(%"IVdf")..%"IVdf"%s\n", + " \\%" UVuf ": %" IVdf "(%" IVdf ")..%" IVdf "%s\n", depth, (UV)paren, (IV)rex->offs[paren].start, @@ -419,7 +420,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p _pDEPTH) rex->offs[i].start = -1; rex->offs[i].end = -1; DEBUG_BUFFERS_r( Perl_re_exec_indentf( aTHX_ - " \\%"UVuf": %s ..-1 undeffing\n", + " \\%" UVuf ": %s ..-1 undeffing\n", depth, (UV)i, (i > *maxopenparen_p) ? "-1" : " " @@ -733,8 +734,8 @@ Perl_re_intuit_start(pTHX_ continue; Perl_re_printf( aTHX_ - " substrs[%d]: min=%"IVdf" max=%"IVdf" end shift=%"IVdf - " useful=%"IVdf" utf8=%d [%s]\n", + " substrs[%d]: min=%" IVdf " max=%" IVdf " end shift=%" IVdf + " useful=%" IVdf " utf8=%d [%s]\n", i, (IV)prog->substrs->data[i].min_offset, (IV)prog->substrs->data[i].max_offset, @@ -793,7 +794,7 @@ Perl_re_intuit_start(pTHX_ char *s = HOP3c(strpos, prog->check_offset_min, strend); DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " Looking for check substr at fixed offset %"IVdf"...\n", + " Looking for check substr at fixed offset %" IVdf "...\n", (IV)prog->check_offset_min)); if (SvTAIL(check)) { @@ -832,7 +833,7 @@ Perl_re_intuit_start(pTHX_ #ifdef DEBUGGING /* 7/99: reports of failure (with the older version) */ if (end_shift < 0) - Perl_croak(aTHX_ "panic: end_shift: %"IVdf" pattern:\n%s\n ", + Perl_croak(aTHX_ "panic: end_shift: %" IVdf " pattern:\n%s\n ", (IV)end_shift, RX_PRECOMP(prog)); #endif @@ -869,9 +870,9 @@ Perl_re_intuit_start(pTHX_ DEBUG_OPTIMISE_MORE_r({ Perl_re_printf( aTHX_ - " At restart: rx_origin=%"IVdf" Check offset min: %"IVdf - " Start shift: %"IVdf" End shift %"IVdf - " Real end Shift: %"IVdf"\n", + " At restart: rx_origin=%" IVdf " Check offset min: %" IVdf + " Start shift: %" IVdf " End shift %" IVdf + " Real end Shift: %" IVdf "\n", (IV)(rx_origin - strbeg), (IV)prog->check_offset_min, (IV)start_shift, @@ -917,7 +918,7 @@ Perl_re_intuit_start(pTHX_ check, multiline ? FBMrf_MULTILINE : 0); DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " doing 'check' fbm scan, [%"IVdf"..%"IVdf"] gave %"IVdf"\n", + " doing 'check' fbm scan, [%" IVdf "..%" IVdf "] gave %" IVdf "\n", (IV)((char*)start_point - strbeg), (IV)((char*)end_point - strbeg), (IV)(check_at ? check_at - strbeg : -1) @@ -949,7 +950,7 @@ Perl_re_intuit_start(pTHX_ rx_origin = HOP3c(check_at, -prog->check_offset_max, rx_origin); /* Finish the diagnostic message */ DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - "%ld (rx_origin now %"IVdf")...\n", + "%ld (rx_origin now %" IVdf ")...\n", (long)(check_at - strbeg), (IV)(rx_origin - strbeg) )); @@ -1065,7 +1066,7 @@ Perl_re_intuit_start(pTHX_ if (from > to) { s = NULL; DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " skipping 'other' fbm scan: %"IVdf" > %"IVdf"\n", + " skipping 'other' fbm scan: %" IVdf " > %" IVdf "\n", (IV)(from - strbeg), (IV)(to - strbeg) )); @@ -1078,7 +1079,7 @@ Perl_re_intuit_start(pTHX_ multiline ? FBMrf_MULTILINE : 0 ); DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " doing 'other' fbm scan, [%"IVdf"..%"IVdf"] gave %"IVdf"\n", + " doing 'other' fbm scan, [%" IVdf "..%" IVdf "] gave %" IVdf "\n", (IV)(from - strbeg), (IV)(to - strbeg), (IV)(s ? s - strbeg : -1) @@ -1114,7 +1115,7 @@ Perl_re_intuit_start(pTHX_ ? HOP3c(rx_origin, 1, strend) : HOP4c(last, 1 - other->min_offset, strbeg, strend); DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - "; about to retry %s at offset %ld (rx_origin now %"IVdf")...\n", + "; about to retry %s at offset %ld (rx_origin now %" IVdf ")...\n", (other_ix ? "floating" : "anchored"), (long)(HOP3c(check_at, 1, strend) - strbeg), (IV)(rx_origin - strbeg) @@ -1138,7 +1139,7 @@ Perl_re_intuit_start(pTHX_ other_last = HOP3c(s, 1, strend); } DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " at offset %ld (rx_origin now %"IVdf")...\n", + " at offset %ld (rx_origin now %" IVdf ")...\n", (long)(s - strbeg), (IV)(rx_origin - strbeg) )); @@ -1148,9 +1149,9 @@ Perl_re_intuit_start(pTHX_ else { DEBUG_OPTIMISE_MORE_r( Perl_re_printf( aTHX_ - " Check-only match: offset min:%"IVdf" max:%"IVdf - " check_at:%"IVdf" rx_origin:%"IVdf" rx_origin-check_at:%"IVdf - " strend:%"IVdf"\n", + " Check-only match: offset min:%" IVdf " max:%" IVdf + " check_at:%" IVdf " rx_origin:%" IVdf " rx_origin-check_at:%" IVdf + " strend:%" IVdf "\n", (IV)prog->check_offset_min, (IV)prog->check_offset_max, (IV)(check_at-strbeg), @@ -1222,7 +1223,7 @@ Perl_re_intuit_start(pTHX_ * didn't contradict, so just retry the anchored "other" * substr */ DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " Found /%s^%s/m, rescanning for anchored from offset %"IVdf" (rx_origin now %"IVdf")...\n", + " Found /%s^%s/m, rescanning for anchored from offset %" IVdf " (rx_origin now %" IVdf ")...\n", PL_colors[0], PL_colors[1], (IV)(rx_origin - strbeg + prog->anchored_offset), (IV)(rx_origin - strbeg) @@ -1296,8 +1297,8 @@ Perl_re_intuit_start(pTHX_ endpos= strend; DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " looking for class: start_shift: %"IVdf" check_at: %"IVdf - " rx_origin: %"IVdf" endpos: %"IVdf"\n", + " looking for class: start_shift: %" IVdf " check_at: %" IVdf + " rx_origin: %" IVdf " endpos: %" IVdf "\n", (IV)start_shift, (IV)(check_at - strbeg), (IV)(rx_origin - strbeg), (IV)(endpos - strbeg))); @@ -1331,7 +1332,7 @@ Perl_re_intuit_start(pTHX_ * practice the extra fbm_instr() is likely to * get skipped anyway. */ DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ - " about to retry anchored at offset %ld (rx_origin now %"IVdf")...\n", + " about to retry anchored at offset %ld (rx_origin now %" IVdf ")...\n", (long)(other_last - strbeg), (IV)(rx_origin - strbeg) )); @@ -1380,7 +1381,7 @@ Perl_re_intuit_start(pTHX_ goto fail; } DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ - " about to look for %s substr starting at offset %ld (rx_origin now %"IVdf")...\n", + " about to look for %s substr starting at offset %ld (rx_origin now %" IVdf ")...\n", (prog->substrs->check_ix ? "floating" : "anchored"), (long)(rx_origin + start_shift - strbeg), (IV)(rx_origin - strbeg) @@ -2622,7 +2623,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, dump_exec_pos( (char *)uc, c, strend, real_start, s, utf8_target, 0); Perl_re_printf( aTHX_ - " Charid:%3u CP:%4"UVxf" ", + " Charid:%3u CP:%4" UVxf " ", charid, uvc); }); } @@ -2643,7 +2644,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, dump_exec_pos( (char *)uc, c, strend, real_start, s, utf8_target, 0 ); Perl_re_printf( aTHX_ - "%sState: %4"UVxf", word=%"UVxf, + "%sState: %4" UVxf ", word=%" UVxf, failed ? " Fail transition to " : "", (UV)state, (UV)word); }); @@ -2694,7 +2695,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, if (leftmost) { s = (char*)leftmost; DEBUG_TRIE_EXECUTE_r({ - Perl_re_printf( aTHX_ "Matches word #%"UVxf" at position %"IVdf". Trying full pattern...\n", + Perl_re_printf( aTHX_ "Matches word #%" UVxf " at position %" IVdf ". Trying full pattern...\n", (UV)accepted_word, (IV)(s - real_start) ); }); @@ -2940,7 +2941,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, : strbeg; /* pos() not defined; use start of string */ DEBUG_GPOS_r(Perl_re_printf( aTHX_ - "GPOS ganch set to strbeg[%"IVdf"]\n", (IV)(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: @@ -3135,7 +3136,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, /* do we need a save destructor here for eval dies? */ Newxz(prog->offs, (prog->nparens + 1), regexp_paren_pair); DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" saving offs: orig=0x%"UVxf" new=0x%"UVxf"\n", + "rex=0x%" UVxf " saving offs: orig=0x%" UVxf " new=0x%" UVxf "\n", 0, PTR2UV(prog), PTR2UV(swap), @@ -3520,7 +3521,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, DEBUG_BUFFERS_r( if (swap) Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" freeing offs: 0x%"UVxf"\n", + "rex=0x%" UVxf " freeing offs: 0x%" UVxf "\n", 0, PTR2UV(prog), PTR2UV(swap) @@ -3558,7 +3559,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, if (swap) { /* we failed :-( roll it back */ DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" rolling back offs: freeing=0x%"UVxf" restoring=0x%"UVxf"\n", + "rex=0x%" UVxf " rolling back offs: freeing=0x%" UVxf " restoring=0x%" UVxf "\n", 0, PTR2UV(prog), PTR2UV(prog->offs), @@ -3676,7 +3677,7 @@ Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) PerlIO *f= Perl_debug_log; PERL_ARGS_ASSERT_RE_EXEC_INDENTF; va_start(ap, depth); - PerlIO_printf(f, "%*s|%4"UVuf"| %*s", REPORT_CODE_OFF, "", (UV)depth, INDENT_CHARS(depth), "" ); + PerlIO_printf(f, "%*s|%4" UVuf "| %*s", REPORT_CODE_OFF, "", (UV)depth, INDENT_CHARS(depth), "" ); result = PerlIO_vprintf(f, fmt, ap); va_end(ap); return result; @@ -3960,7 +3961,7 @@ S_dump_exec_pos(pTHX_ const char *locinput, const STRLEN tlen=len0+len1+len2; Perl_re_printf( aTHX_ - "%4"IVdf" <%.*s%.*s%s%.*s>%*s|%4u| ", + "%4" IVdf " <%.*s%.*s%s%.*s>%*s|%4u| ", (IV)(locinput - loc_bostr), len0, s0, len1, s1, @@ -5440,7 +5441,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) DUMP_EXEC_POS( locinput, scan, utf8_target, depth ); regprop(rex, prop, scan, reginfo, NULL); Perl_re_printf( aTHX_ - "%*s%"IVdf":%s(%"IVdf")\n", + "%*s%" IVdf ":%s(%" IVdf ")\n", INDENT_CHARS(depth), "", (IV)(scan - rexi->program), SvPVX_const(prop), @@ -5665,7 +5666,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) DUMP_EXEC_POS( (char *)uc, scan, utf8_target, depth ); /* HERE */ PerlIO_printf( Perl_debug_log, - "%*s%sState: %4"UVxf" Accepted: %c ", + "%*s%sState: %4" UVxf " Accepted: %c ", INDENT_CHARS(depth), "", PL_colors[4], (UV)state, (accepted ? 'Y' : 'N')); }); @@ -5699,7 +5700,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } DEBUG_TRIE_EXECUTE_r( Perl_re_printf( aTHX_ - "Charid:%3x CP:%4"UVxf" After State: %4"UVxf"%s\n", + "Charid:%3x CP:%4" UVxf " After State: %4" UVxf "%s\n", charid, uvc, (UV)state, PL_colors[5] ); ); } @@ -5718,7 +5719,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "%sgot %"IVdf" possible matches%s\n", + Perl_re_exec_indentf( aTHX_ "%sgot %" IVdf " possible matches%s\n", depth, PL_colors[4], (IV)ST.accepted, PL_colors[5] ); ); @@ -6881,7 +6882,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) nop = nop->op_next; DEBUG_STATE_r( Perl_re_printf( aTHX_ - " re EVAL PL_op=0x%"UVxf"\n", PTR2UV(nop)) ); + " re EVAL PL_op=0x%" UVxf "\n", PTR2UV(nop)) ); rex->offs[0].end = locinput - reginfo->strbeg; if (reginfo->info_aux_eval->pos_magic) @@ -7143,7 +7144,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) if (n > maxopenparen) maxopenparen = n; DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" offs=0x%"UVxf": \\%"UVuf": set %"IVdf" tmp; maxopenparen=%"UVuf"\n", + "rex=0x%" UVxf " offs=0x%" UVxf ": \\%" UVuf ": set %" IVdf " tmp; maxopenparen=%" UVuf "\n", depth, PTR2UV(rex), PTR2UV(rex->offs), @@ -7159,7 +7160,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) rex->offs[n].start = rex->offs[n].start_tmp; \ rex->offs[n].end = locinput - reginfo->strbeg; \ DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ \ - "rex=0x%"UVxf" offs=0x%"UVxf": \\%"UVuf": set %"IVdf"..%"IVdf"\n", \ + "rex=0x%" UVxf " offs=0x%" UVxf ": \\%" UVuf ": set %" IVdf "..%" IVdf "\n", \ depth, \ PTR2UV(rex), \ PTR2UV(rex->offs), \ @@ -7737,7 +7738,7 @@ NULL ST.count = ST.minmod ? ARG1(ST.me) : ARG2(ST.me); } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "CURLYM now matched %"IVdf" times, len=%"IVdf"...\n", + Perl_re_exec_indentf( aTHX_ "CURLYM now matched %" IVdf " times, len=%" IVdf "...\n", depth, (IV) ST.count, (IV)ST.alen) ); @@ -7790,7 +7791,7 @@ NULL } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "CURLYM trying tail with matches=%"IVdf"...\n", + Perl_re_exec_indentf( aTHX_ "CURLYM trying tail with matches=%" IVdf "...\n", depth, (IV)ST.count) ); if (! NEXTCHR_IS_EOS && ST.c1 != CHRTEST_VOID) { @@ -7800,7 +7801,7 @@ NULL { /* simulate B failing */ DEBUG_OPTIMISE_r( - Perl_re_exec_indentf( aTHX_ "CURLYM Fast bail next target=0x%"UVXf" c1=0x%"UVXf" c2=0x%"UVXf"\n", + Perl_re_exec_indentf( aTHX_ "CURLYM Fast bail next target=0x%" UVXf " c1=0x%" UVXf " c2=0x%" UVXf "\n", depth, valid_utf8_to_uvchr((U8 *) locinput, NULL), valid_utf8_to_uvchr(ST.c1_utf8, NULL), @@ -8362,7 +8363,7 @@ NULL sv_commit = ST.mark_name; DEBUG_EXECUTE_r({ - Perl_re_exec_indentf( aTHX_ "%ssetting cutpoint to mark:%"SVf"...%s\n", + Perl_re_exec_indentf( aTHX_ "%ssetting cutpoint to mark:%" SVf "...%s\n", depth, PL_colors[4], SVfARG(sv_commit), PL_colors[5]); }); @@ -8427,7 +8428,7 @@ NULL break; default: - PerlIO_printf(Perl_error_log, "%"UVxf" %d\n", + PerlIO_printf(Perl_error_log, "%" UVxf " %d\n", PTR2UV(scan), OP(scan)); Perl_croak(aTHX_ "regexp memory corruption"); @@ -9155,7 +9156,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, DEBUG_EXECUTE_r({ SV * const prop = sv_newmortal(); regprop(prog, prop, p, reginfo, NULL); - Perl_re_exec_indentf( aTHX_ "%s can match %"IVdf" times out of %"IVdf"...\n", + Perl_re_exec_indentf( aTHX_ "%s can match %" IVdf " times out of %" IVdf "...\n", depth, SvPVX_const(prop),(IV)c,(IV)max); }); }); @@ -9357,7 +9358,7 @@ S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8* const && ckWARN_d(WARN_NON_UNICODE)) { Perl_warner(aTHX_ packWARN(WARN_NON_UNICODE), - "Matched non-Unicode code point 0x%04"UVXf" against Unicode property; may not be portable", c); + "Matched non-Unicode code point 0x%04" UVXf " against Unicode property; may not be portable", c); } } @@ -36,7 +36,7 @@ Perl_stack_grow(pTHX_ SV **sp, SV **p, SSize_t n) if (UNLIKELY(n < 0)) Perl_croak(aTHX_ - "panic: stack_grow() negative count (%"IVdf")", (IV)n); + "panic: stack_grow() negative count (%" IVdf ")", (IV)n); PL_stack_sp = sp; extra = @@ -132,7 +132,7 @@ Perl_markstack_grow(pTHX) PL_markstack_max = PL_markstack + newmax; PL_markstack_ptr = PL_markstack + oldmax; DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, - "MARK grow %p %"IVdf" by %"IVdf"\n", + "MARK grow %p %" IVdf " by %" IVdf "\n", PL_markstack_ptr, (IV)*PL_markstack_ptr, (IV)oldmax))); return PL_markstack_ptr; } @@ -584,7 +584,7 @@ Perl_save_clearsv(pTHX_ SV **svp) ASSERT_CURPAD_ACTIVE("save_clearsv"); SvPADSTALE_off(*svp); /* mark lexical as active */ if (UNLIKELY((offset_shifted >> SAVE_TIGHT_SHIFT) != offset)) { - Perl_croak(aTHX_ "panic: pad offset %"UVuf" out of range (%p-%p)", + Perl_croak(aTHX_ "panic: pad offset %" UVuf " out of range (%p-%p)", offset, svp, PL_curpad); } @@ -772,7 +772,7 @@ Perl_save_alloc(pTHX_ I32 size, I32 pad) if (UNLIKELY((elems_shifted >> SAVE_TIGHT_SHIFT) != elems)) Perl_croak(aTHX_ - "panic: save_alloc elems %"UVuf" out of range (%"IVdf"-%"IVdf")", + "panic: save_alloc elems %" UVuf " out of range (%" IVdf "-%" IVdf ")", elems, (IV)size, (IV)pad); SSGROW(elems + 1); @@ -1130,7 +1130,7 @@ Perl_leave_scope(pTHX_ I32 base) SV *sv = *svp; DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] clearsv: %ld sv=0x%"UVxf"<%"IVdf"> %s\n", + "Pad 0x%" UVxf "[0x%" UVxf "] clearsv: %ld sv=0x%" UVxf "<%" IVdf "> %s\n", PTR2UV(PL_comppad), PTR2UV(PL_curpad), (long)(svp-PL_curpad), PTR2UV(sv), (IV)SvREFCNT(sv), (SvREFCNT(sv) <= 1 && !SvOBJECT(sv)) ? "clear" : "abandon" @@ -1452,12 +1452,12 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) if (CxTYPE(cx) != CXt_SUBST) { const char *gimme_text; PerlIO_printf(Perl_debug_log, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp); - PerlIO_printf(Perl_debug_log, "BLK_OLDCOP = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_OLDCOP = 0x%" UVxf "\n", PTR2UV(cx->blk_oldcop)); PerlIO_printf(Perl_debug_log, "BLK_OLDMARKSP = %ld\n", (long)cx->blk_oldmarksp); PerlIO_printf(Perl_debug_log, "BLK_OLDSCOPESP = %ld\n", (long)cx->blk_oldscopesp); PerlIO_printf(Perl_debug_log, "BLK_OLDSAVEIX = %ld\n", (long)cx->blk_oldsaveix); - PerlIO_printf(Perl_debug_log, "BLK_OLDPM = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_OLDPM = 0x%" UVxf "\n", PTR2UV(cx->blk_oldpm)); switch (cx->blk_gimme) { case G_VOID: @@ -1480,26 +1480,26 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) case CXt_BLOCK: break; case CXt_FORMAT: - PerlIO_printf(Perl_debug_log, "BLK_FORMAT.CV = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_FORMAT.CV = 0x%" UVxf "\n", PTR2UV(cx->blk_format.cv)); - PerlIO_printf(Perl_debug_log, "BLK_FORMAT.GV = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_FORMAT.GV = 0x%" UVxf "\n", PTR2UV(cx->blk_format.gv)); - PerlIO_printf(Perl_debug_log, "BLK_FORMAT.DFOUTGV = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_FORMAT.DFOUTGV = 0x%" UVxf "\n", PTR2UV(cx->blk_format.dfoutgv)); PerlIO_printf(Perl_debug_log, "BLK_FORMAT.HASARGS = %d\n", (int)CxHASARGS(cx)); - PerlIO_printf(Perl_debug_log, "BLK_FORMAT.RETOP = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_FORMAT.RETOP = 0x%" UVxf "\n", PTR2UV(cx->blk_format.retop)); break; case CXt_SUB: - PerlIO_printf(Perl_debug_log, "BLK_SUB.CV = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_SUB.CV = 0x%" UVxf "\n", PTR2UV(cx->blk_sub.cv)); PerlIO_printf(Perl_debug_log, "BLK_SUB.OLDDEPTH = %ld\n", (long)cx->blk_sub.olddepth); PerlIO_printf(Perl_debug_log, "BLK_SUB.HASARGS = %d\n", (int)CxHASARGS(cx)); PerlIO_printf(Perl_debug_log, "BLK_SUB.LVAL = %d\n", (int)CxLVAL(cx)); - PerlIO_printf(Perl_debug_log, "BLK_SUB.RETOP = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_SUB.RETOP = 0x%" UVxf "\n", PTR2UV(cx->blk_sub.retop)); break; case CXt_EVAL: @@ -1511,9 +1511,9 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) if (cx->blk_eval.old_namesv) PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_NAME = %s\n", SvPVX_const(cx->blk_eval.old_namesv)); - PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_EVAL_ROOT = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_EVAL_ROOT = 0x%" UVxf "\n", PTR2UV(cx->blk_eval.old_eval_root)); - PerlIO_printf(Perl_debug_log, "BLK_EVAL.RETOP = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_EVAL.RETOP = 0x%" UVxf "\n", PTR2UV(cx->blk_eval.retop)); break; @@ -1523,15 +1523,15 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) case CXt_LOOP_LIST: case CXt_LOOP_ARY: PerlIO_printf(Perl_debug_log, "BLK_LOOP.LABEL = %s\n", CxLABEL(cx)); - PerlIO_printf(Perl_debug_log, "BLK_LOOP.MY_OP = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_LOOP.MY_OP = 0x%" UVxf "\n", PTR2UV(cx->blk_loop.my_op)); if (CxTYPE(cx) != CXt_LOOP_PLAIN) { - PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERVAR = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERVAR = 0x%" UVxf "\n", PTR2UV(CxITERVAR(cx))); - PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERSAVE = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERSAVE = 0x%" UVxf "\n", PTR2UV(cx->blk_loop.itersave)); /* XXX: not accurate for LAZYSV/IV/LIST */ - PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERARY = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERARY = 0x%" UVxf "\n", PTR2UV(cx->blk_loop.state_u.ary.ary)); PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERIX = %ld\n", (long)cx->blk_loop.state_u.ary.ix); @@ -1549,17 +1549,17 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) (long)CxONCE(cx)); PerlIO_printf(Perl_debug_log, "SB_ORIG = %s\n", cx->sb_orig); - PerlIO_printf(Perl_debug_log, "SB_DSTR = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "SB_DSTR = 0x%" UVxf "\n", PTR2UV(cx->sb_dstr)); - PerlIO_printf(Perl_debug_log, "SB_TARG = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "SB_TARG = 0x%" UVxf "\n", PTR2UV(cx->sb_targ)); - PerlIO_printf(Perl_debug_log, "SB_S = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "SB_S = 0x%" UVxf "\n", PTR2UV(cx->sb_s)); - PerlIO_printf(Perl_debug_log, "SB_M = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "SB_M = 0x%" UVxf "\n", PTR2UV(cx->sb_m)); - PerlIO_printf(Perl_debug_log, "SB_STREND = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "SB_STREND = 0x%" UVxf "\n", PTR2UV(cx->sb_strend)); - PerlIO_printf(Perl_debug_log, "SB_RXRES = 0x%"UVxf"\n", + PerlIO_printf(Perl_debug_log, "SB_RXRES = 0x%" UVxf "\n", PTR2UV(cx->sb_rxres)); break; } @@ -245,7 +245,7 @@ Public API: if ((sv)->sv_debug_file) PerlMemShared_free((sv)->sv_debug_file); \ } STMT_END # define DEBUG_SV_SERIAL(sv) \ - DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) del_SV\n", \ + DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%" UVxf ": (%05ld) del_SV\n", \ PTR2UV(sv), (long)(sv)->sv_debug_serial)) #else # define FREE_SV_DEBUG_FILE(sv) @@ -340,7 +340,7 @@ S_new_SV(pTHX_ const char *file, int line, const char *func) sv->sv_debug_serial = PL_sv_serial++; MEM_LOG_NEW_SV(sv, file, line, func); - DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) new_SV (from %s:%d [%s])\n", + DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%" UVxf ": (%05ld) new_SV (from %s:%d [%s])\n", PTR2UV(sv), (long)sv->sv_debug_serial, file, line, func)); return sv; @@ -392,7 +392,7 @@ S_del_sv(pTHX_ SV *p) } if (!ok) { Perl_ck_warner_d(aTHX_ packWARN(WARN_INTERNAL), - "Attempt to free non-arena SV: 0x%"UVxf + "Attempt to free non-arena SV: 0x%" UVxf pTHX__FORMAT, PTR2UV(p) pTHX__VALUE); return; } @@ -654,7 +654,7 @@ do_clean_all(pTHX_ SV *const sv) /* don't clean pid table and strtab */ return; } - DEBUG_D((PerlIO_printf(Perl_debug_log, "Cleaning loops: SV at 0x%"UVxf"\n", PTR2UV(sv)) )); + DEBUG_D((PerlIO_printf(Perl_debug_log, "Cleaning loops: SV at 0x%" UVxf "\n", PTR2UV(sv)) )); SvFLAGS(sv) |= SVf_BREAK; SvREFCNT_dec_NN(sv); } @@ -1111,7 +1111,7 @@ Perl_more_bodies (pTHX_ const svtype sv_type, const size_t body_size, Newx(adesc->arena, good_arena_size, char); adesc->size = good_arena_size; adesc->utype = sv_type; - DEBUG_m(PerlIO_printf(Perl_debug_log, "arena %d added: %p size %"UVuf"\n", + DEBUG_m(PerlIO_printf(Perl_debug_log, "arena %d added: %p size %" UVuf "\n", curr, (void*)adesc->arena, (UV)good_arena_size)); start = (char *) adesc->arena; @@ -2038,7 +2038,7 @@ S_sv_2iuv_non_preserve(pTHX_ SV *const sv PERL_ARGS_ASSERT_SV_2IUV_NON_PRESERVE; PERL_UNUSED_CONTEXT; - DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2iuv_non '%s', IV=0x%"UVxf" NV=%"NVgf" inttype=%"UVXf"\n", SvPVX_const(sv), SvIVX(sv), SvNVX(sv), (UV)numtype)); + DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2iuv_non '%s', IV=0x%" UVxf " NV=%" NVgf " inttype=%" UVXf "\n", SvPVX_const(sv), SvIVX(sv), SvNVX(sv), (UV)numtype)); if (SvNVX(sv) < (NV)IV_MIN) { (void)SvIOKp_on(sv); (void)SvNOK_on(sv); @@ -2165,7 +2165,7 @@ S_sv_2iuv_common(pTHX_ SV *const sv) /* scalar has trailing garbage, eg "42a" */ } DEBUG_c(PerlIO_printf(Perl_debug_log, - "0x%"UVxf" iv(%"NVgf" => %"IVdf") (precise)\n", + "0x%" UVxf " iv(%" NVgf " => %" IVdf ") (precise)\n", PTR2UV(sv), SvNVX(sv), SvIVX(sv))); @@ -2176,7 +2176,7 @@ S_sv_2iuv_common(pTHX_ SV *const sv) that PV->IV would be better than PV->NV->IV flags already correct - don't set public IOK. */ DEBUG_c(PerlIO_printf(Perl_debug_log, - "0x%"UVxf" iv(%"NVgf" => %"IVdf") (imprecise)\n", + "0x%" UVxf " iv(%" NVgf " => %" IVdf ") (imprecise)\n", PTR2UV(sv), SvNVX(sv), SvIVX(sv))); @@ -2207,7 +2207,7 @@ S_sv_2iuv_common(pTHX_ SV *const sv) SvIOK_on(sv); SvIsUV_on(sv); DEBUG_c(PerlIO_printf(Perl_debug_log, - "0x%"UVxf" 2iv(%"UVuf" => %"IVdf") (as unsigned)\n", + "0x%" UVxf " 2iv(%" UVuf " => %" IVdf ") (as unsigned)\n", PTR2UV(sv), SvUVX(sv), SvUVX(sv))); @@ -2313,7 +2313,7 @@ S_sv_2iuv_common(pTHX_ SV *const sv) if (! numtype && ckWARN(WARN_NUMERIC)) not_a_number(sv); - DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%"UVxf" 2iv(%" NVgf ")\n", + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%" UVxf " 2iv(%" NVgf ")\n", PTR2UV(sv), SvNVX(sv))); #ifdef NV_PRESERVES_UV @@ -2372,7 +2372,7 @@ S_sv_2iuv_common(pTHX_ SV *const sv) this NV is in the preserved range, therefore: */ if (!(U_V(SvNVX(sv) > 0 ? SvNVX(sv) : -SvNVX(sv)) < (UV)IV_MAX)) { - Perl_croak(aTHX_ "sv_2iv assumed (U_V(fabs((double)SvNVX(sv))) < (UV)IV_MAX) but SvNVX(sv)=%"NVgf" U_V is 0x%"UVxf", IV_MAX is 0x%"UVxf"\n", SvNVX(sv), U_V(SvNVX(sv)), (UV)IV_MAX); + Perl_croak(aTHX_ "sv_2iv assumed (U_V(fabs((double)SvNVX(sv))) < (UV)IV_MAX) but SvNVX(sv)=%" NVgf " U_V is 0x%" UVxf ", IV_MAX is 0x%" UVxf "\n", SvNVX(sv), U_V(SvNVX(sv)), (UV)IV_MAX); } } else { /* IN_UV NOT_INT @@ -2505,7 +2505,7 @@ Perl_sv_2iv_flags(pTHX_ SV *const sv, const I32 flags) return 0; } - DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%"UVxf" 2iv(%"IVdf")\n", + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%" UVxf " 2iv(%" IVdf ")\n", PTR2UV(sv),SvIVX(sv))); return SvIsUV(sv) ? (IV)SvUVX(sv) : SvIVX(sv); } @@ -2588,7 +2588,7 @@ Perl_sv_2uv_flags(pTHX_ SV *const sv, const I32 flags) return 0; } - DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%"UVxf" 2uv(%"UVuf")\n", + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%" UVxf " 2uv(%" UVuf ")\n", PTR2UV(sv),SvUVX(sv))); return SvIsUV(sv) ? SvUVX(sv) : (UV)SvIVX(sv); } @@ -2669,7 +2669,7 @@ Perl_sv_2nv_flags(pTHX_ SV *const sv, const I32 flags) DEBUG_c({ STORE_NUMERIC_LOCAL_SET_STANDARD(); PerlIO_printf(Perl_debug_log, - "0x%"UVxf" num(%" NVgf ")\n", + "0x%" UVxf " num(%" NVgf ")\n", PTR2UV(sv), SvNVX(sv)); RESTORE_NUMERIC_LOCAL(); }); @@ -2809,7 +2809,7 @@ Perl_sv_2nv_flags(pTHX_ SV *const sv, const I32 flags) } DEBUG_c({ STORE_NUMERIC_LOCAL_SET_STANDARD(); - PerlIO_printf(Perl_debug_log, "0x%"UVxf" 2nv(%" NVgf ")\n", + PerlIO_printf(Perl_debug_log, "0x%" UVxf " 2nv(%" NVgf ")\n", PTR2UV(sv), SvNVX(sv)); RESTORE_NUMERIC_LOCAL(); }); @@ -3206,7 +3206,7 @@ Perl_sv_2pv_flags(pTHX_ SV *const sv, STRLEN *const lp, const I32 flags) *lp = len; SvCUR_set(sv, len); } - DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%"UVxf" 2pv(%s)\n", + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%" UVxf " 2pv(%s)\n", PTR2UV(sv),SvPVX_const(sv))); if (flags & SV_CONST_RETURN) return (char *)SvPVX_const(sv); @@ -4080,11 +4080,11 @@ Perl_gv_setref(pTHX_ SV *const dstr, SV *const sstr) sv_2mortal( stash ? Perl_newSVpvf(aTHX_ - "%"HEKf"::%"HEKf, + "%" HEKf "::%" HEKf, HEKfARG(HvNAME_HEK(stash)), HEKfARG(GvENAME_HEK(MUTABLE_GV(dstr)))) : Perl_newSVpvf(aTHX_ - "%"HEKf, + "%" HEKf, HEKfARG(GvENAME_HEK(MUTABLE_GV(dstr)))) ), cv, @@ -6231,7 +6231,7 @@ Perl_sv_kill_backrefs(pTHX_ SV *const sv, AV *const av) } else { Perl_croak(aTHX_ - "panic: magic_killbackrefs (flags=%"UVxf")", + "panic: magic_killbackrefs (flags=%" UVxf ")", (UV)SvFLAGS(referrer)); } @@ -6565,7 +6565,7 @@ Perl_sv_clear(pTHX_ SV *const orig_sv) { if (PL_stashcache) { DEBUG_o(Perl_deb(aTHX_ - "sv_clear clearing PL_stashcache for '%"HEKf + "sv_clear clearing PL_stashcache for '%" HEKf "'\n", HEKfARG(hek))); (void)hv_deletehek(PL_stashcache, @@ -6789,7 +6789,7 @@ Perl_sv_clear(pTHX_ SV *const orig_sv) #ifdef DEBUGGING if (SvTEMP(sv)) { Perl_ck_warner_d(aTHX_ packWARN(WARN_DEBUGGING), - "Attempt to free temp prematurely: SV 0x%"UVxf + "Attempt to free temp prematurely: SV 0x%" UVxf pTHX__FORMAT, PTR2UV(sv) pTHX__VALUE); continue; } @@ -6914,7 +6914,7 @@ S_curse(pTHX_ SV * const sv, const bool check_refcnt) { if (check_refcnt && SvREFCNT(sv)) { if (PL_in_clean_objs) Perl_croak(aTHX_ - "DESTROY created new reference to dead object '%"HEKf"'", + "DESTROY created new reference to dead object '%" HEKf "'", HEKfARG(HvNAME_HEK(stash))); /* DESTROY gave object new lease on life */ return FALSE; @@ -6985,7 +6985,7 @@ Perl_sv_free2(pTHX_ SV *const sv, const U32 rc) #ifdef DEBUGGING if (SvTEMP(sv)) { Perl_ck_warner_d(aTHX_ packWARN(WARN_DEBUGGING), - "Attempt to free temp prematurely: SV 0x%"UVxf + "Attempt to free temp prematurely: SV 0x%" UVxf pTHX__FORMAT, PTR2UV(sv) pTHX__VALUE); return; } @@ -7032,7 +7032,7 @@ Perl_sv_free2(pTHX_ SV *const sv, const U32 rc) #endif /* This may not return: */ Perl_warner(aTHX_ packWARN(WARN_INTERNAL), - "Attempt to free unreferenced scalar: SV 0x%"UVxf + "Attempt to free unreferenced scalar: SV 0x%" UVxf pTHX__FORMAT, PTR2UV(sv) pTHX__VALUE); #endif } @@ -7621,8 +7621,8 @@ Perl_sv_pos_b2u_flags(pTHX_ SV *const sv, STRLEN const offset, U32 flags) s = (const U8*)SvPV_flags(sv, blen, flags); if (blen < offset) - Perl_croak(aTHX_ "panic: sv_pos_b2u: bad byte offset, blen=%"UVuf - ", byte=%"UVuf, (UV)blen, (UV)offset); + Perl_croak(aTHX_ "panic: sv_pos_b2u: bad byte offset, blen=%" UVuf + ", byte=%" UVuf, (UV)blen, (UV)offset); send = s + offset; @@ -7739,7 +7739,7 @@ S_assert_uft8_cache_coherent(pTHX_ const char *const func, STRLEN from_cache, while printing error messages. */ SAVEI8(PL_utf8cache); PL_utf8cache = 0; - Perl_croak(aTHX_ "panic: %s cache %"UVuf" real %"UVuf" for %"SVf, + Perl_croak(aTHX_ "panic: %s cache %" UVuf " real %" UVuf " for %" SVf, func, (UV) from_cache, (UV) real, SVfARG(sv)); } @@ -8582,10 +8582,10 @@ Perl_sv_gets(pTHX_ SV *const sv, PerlIO *const fp, I32 append) /* some trace debug output */ DEBUG_P(PerlIO_printf(Perl_debug_log, - "Screamer: entering, ptr=%"UVuf", cnt=%ld\n",PTR2UV(ptr),(long)cnt)); + "Screamer: entering, ptr=%" UVuf ", cnt=%ld\n",PTR2UV(ptr),(long)cnt)); DEBUG_P(PerlIO_printf(Perl_debug_log, - "Screamer: entering: PerlIO * thinks ptr=%"UVuf", cnt=%"IVdf", base=%" - UVuf"\n", + "Screamer: entering: PerlIO * thinks ptr=%" UVuf ", cnt=%" IVdf ", base=%" + UVuf "\n", PTR2UV(PerlIO_get_ptr(fp)), (IV)PerlIO_get_cnt(fp), PTR2UV(PerlIO_has_base(fp) ? PerlIO_get_base(fp) : 0))); @@ -8631,12 +8631,12 @@ Perl_sv_gets(pTHX_ SV *const sv, PerlIO *const fp, I32 append) /* we need to refill the read-ahead buffer if possible */ DEBUG_P(PerlIO_printf(Perl_debug_log, - "Screamer: going to getc, ptr=%"UVuf", cnt=%"IVdf"\n", + "Screamer: going to getc, ptr=%" UVuf ", cnt=%" IVdf "\n", PTR2UV(ptr),(IV)cnt)); PerlIO_set_ptrcnt(fp, (STDCHAR*)ptr, cnt); /* deregisterize cnt and ptr */ DEBUG_Pv(PerlIO_printf(Perl_debug_log, - "Screamer: pre: FILE * thinks ptr=%"UVuf", cnt=%"IVdf", base=%"UVuf"\n", + "Screamer: pre: FILE * thinks ptr=%" UVuf ", cnt=%" IVdf ", base=%" UVuf "\n", PTR2UV(PerlIO_get_ptr(fp)), (IV)PerlIO_get_cnt(fp), PTR2UV(PerlIO_has_base (fp) ? PerlIO_get_base(fp) : 0))); @@ -8652,7 +8652,7 @@ Perl_sv_gets(pTHX_ SV *const sv, PerlIO *const fp, I32 append) i = PerlIO_getc(fp); /* get more characters */ DEBUG_Pv(PerlIO_printf(Perl_debug_log, - "Screamer: post: FILE * thinks ptr=%"UVuf", cnt=%"IVdf", base=%"UVuf"\n", + "Screamer: post: FILE * thinks ptr=%" UVuf ", cnt=%" IVdf ", base=%" UVuf "\n", PTR2UV(PerlIO_get_ptr(fp)), (IV)PerlIO_get_cnt(fp), PTR2UV(PerlIO_has_base (fp) ? PerlIO_get_base(fp) : 0))); @@ -8660,7 +8660,7 @@ Perl_sv_gets(pTHX_ SV *const sv, PerlIO *const fp, I32 append) cnt = PerlIO_get_cnt(fp); ptr = (STDCHAR*)PerlIO_get_ptr(fp); /* reregisterize cnt and ptr */ DEBUG_P(PerlIO_printf(Perl_debug_log, - "Screamer: after getc, ptr=%"UVuf", cnt=%"IVdf"\n", + "Screamer: after getc, ptr=%" UVuf ", cnt=%" IVdf "\n", PTR2UV(ptr),(IV)cnt)); if (i == EOF) /* all done for ever? */ @@ -8690,10 +8690,10 @@ Perl_sv_gets(pTHX_ SV *const sv, PerlIO *const fp, I32 append) if (shortbuffered) cnt += shortbuffered; DEBUG_P(PerlIO_printf(Perl_debug_log, - "Screamer: quitting, ptr=%"UVuf", cnt=%"IVdf"\n",PTR2UV(ptr),(IV)cnt)); + "Screamer: quitting, ptr=%" UVuf ", cnt=%" IVdf "\n",PTR2UV(ptr),(IV)cnt)); PerlIO_set_ptrcnt(fp, (STDCHAR*)ptr, cnt); /* put these back or we're in trouble */ DEBUG_P(PerlIO_printf(Perl_debug_log, - "Screamer: end: FILE * thinks ptr=%"UVuf", cnt=%"IVdf", base=%"UVuf + "Screamer: end: FILE * thinks ptr=%" UVuf ", cnt=%" IVdf ", base=%" UVuf "\n", PTR2UV(PerlIO_get_ptr(fp)), (IV)PerlIO_get_cnt(fp), PTR2UV(PerlIO_has_base (fp) ? PerlIO_get_base(fp) : 0))); @@ -8912,7 +8912,7 @@ Perl_sv_inc_nomg(pTHX_ SV *const sv) /* I don't think we can get here. Maybe I should assert this And if we do get here I suspect that sv_setnv will croak. NWC Fall through. */ - DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_inc punt failed to convert '%s' to IOK or NOKp, UV=0x%"UVxf" NV=%"NVgf"\n", + DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_inc punt failed to convert '%s' to IOK or NOKp, UV=0x%" UVxf " NV=%" NVgf "\n", SvPVX_const(sv), SvIVX(sv), SvNVX(sv))); } #endif /* PERL_PRESERVE_IVUV */ @@ -9090,7 +9090,7 @@ Perl_sv_dec_nomg(pTHX_ SV *const sv) /* I don't think we can get here. Maybe I should assert this And if we do get here I suspect that sv_setnv will croak. NWC Fall through. */ - DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_dec punt failed to convert '%s' to IOK or NOKp, UV=0x%"UVxf" NV=%"NVgf"\n", + DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_dec punt failed to convert '%s' to IOK or NOKp, UV=0x%" UVxf " NV=%" NVgf "\n", SvPVX_const(sv), SvIVX(sv), SvNVX(sv))); } } @@ -9784,7 +9784,7 @@ Perl_sv_2io(pTHX_ SV *const sv) gv = MUTABLE_GV(sv); io = GvIO(gv); if (!io) - Perl_croak(aTHX_ "Bad filehandle: %"HEKf, + Perl_croak(aTHX_ "Bad filehandle: %" HEKf, HEKfARG(GvNAME_HEK(gv))); break; } @@ -9807,7 +9807,7 @@ Perl_sv_2io(pTHX_ SV *const sv) newsv = sv_newmortal(); sv_setsv_nomg(newsv, sv); } - Perl_croak(aTHX_ "Bad filehandle: %"SVf, SVfARG(newsv)); + Perl_croak(aTHX_ "Bad filehandle: %" SVf, SVfARG(newsv)); } break; } @@ -9989,7 +9989,7 @@ Perl_sv_pvn_force_flags(pTHX_ SV *const sv, STRLEN *const lp, const I32 flags) if (!SvPOK(sv)) { SvPOK_on(sv); /* validate pointer */ SvTAINT(sv); - DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%"UVxf" 2pv(%s)\n", + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%" UVxf " 2pv(%s)\n", PTR2UV(sv),SvPVX_const(sv))); } } @@ -11920,7 +11920,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p if (vectorize) goto unknown; if (infnan) - Perl_croak(aTHX_ "Cannot printf %"NVgf" with '%c'", + Perl_croak(aTHX_ "Cannot printf %" NVgf " with '%c'", /* no va_arg() case */ SvNV_nomg(argsv), (int)c); uv = (args) ? va_arg(*args, int) : SvIV_nomg(argsv); @@ -12308,7 +12308,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p i = PERL_INT_MIN; (void)Perl_frexp((NV)fv, &i); if (i == PERL_INT_MIN) - Perl_die(aTHX_ "panic: frexp: %"FV_GF, fv); + Perl_die(aTHX_ "panic: frexp: %" FV_GF, fv); /* Do not set hexfp earlier since we want to printf * Inf/NaN for Inf/NaN, not their hexfp. */ hexfp = isALPHA_FOLD_EQ(c, 'a'); @@ -12878,14 +12878,14 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p sv_catpvn_nomg(msg, f, 1); } else { Perl_sv_catpvf(aTHX_ msg, - "\\%03"UVof, (UV)*f & 0xFF); + "\\%03" UVof, (UV)*f & 0xFF); } } sv_catpvs(msg, "\""); } else { sv_catpvs(msg, "end of string"); } - Perl_warner(aTHX_ packWARN(WARN_PRINTF), "%"SVf, SVfARG(msg)); /* yes, this is reentrant */ + Perl_warner(aTHX_ packWARN(WARN_PRINTF), "%" SVf, SVfARG(msg)); /* yes, this is reentrant */ } /* output mangled stuff ... */ @@ -14583,7 +14583,7 @@ Perl_ss_dup(pTHX_ PerlInterpreter *proto_perl, CLONE_PARAMS* param) break; default: Perl_croak(aTHX_ - "panic: ss_dup inconsistency (%"IVdf")", (IV) type); + "panic: ss_dup inconsistency (%" IVdf ")", (IV) type); } } @@ -15359,7 +15359,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_watchok = PL_watchaddr ? * PL_watchaddr : NULL; if (PL_debug && PL_watchaddr) { PerlIO_printf(Perl_debug_log, - "WATCHING: %"UVxf" cloned as %"UVxf" with value %"UVxf"\n", + "WATCHING: %" UVxf " cloned as %" UVxf " with value %" UVxf "\n", PTR2UV(proto_perl->Iwatchaddr), PTR2UV(PL_watchaddr), PTR2UV(PL_watchok)); } @@ -15807,7 +15807,7 @@ Perl_varname(pTHX_ const GV *const gv, const char gvtype, PADOFFSET targ, } else if (subscript_type == FUV_SUBSCRIPT_ARRAY) { *SvPVX(name) = '$'; - Perl_sv_catpvf(aTHX_ name, "[%"IVdf"]", (IV)aindex); + Perl_sv_catpvf(aTHX_ name, "[%" IVdf "]", (IV)aindex); } else if (subscript_type == FUV_SUBSCRIPT_WITHIN) { /* We know that name has no magic, so can use 0 instead of SV_GMAGIC */ @@ -35,11 +35,11 @@ Perl_taint_proper(pTHX_ const char *f, const char *const s) #if Uid_t_sign == 1 /* uid_t is unsigned. */ DEBUG_u(PerlIO_printf(Perl_debug_log, - "%s %d %"UVuf" %"UVuf"\n", + "%s %d %" UVuf " %" UVuf "\n", s, TAINT_get, (UV)uid, (UV)euid)); #else /* uid_t is signed (Uid_t_sign == -1), or don't know. */ DEBUG_u(PerlIO_printf(Perl_debug_log, - "%s %d %"IVdf" %"IVdf"\n", + "%s %d %" IVdf " %" IVdf "\n", s, TAINT_get, (IV)uid, (IV)euid)); #endif } @@ -413,12 +413,12 @@ S_tokereport(pTHX_ I32 rv, const YYSTYPE* lvalp) else if (!rv) sv_catpvs(report, "EOF"); else - Perl_sv_catpvf(aTHX_ report, "?? %"IVdf, (IV)rv); + Perl_sv_catpvf(aTHX_ report, "?? %" IVdf, (IV)rv); switch (type) { case TOKENTYPE_NONE: break; case TOKENTYPE_IVAL: - Perl_sv_catpvf(aTHX_ report, "(ival=%"IVdf")", (IV)lvalp->ival); + Perl_sv_catpvf(aTHX_ report, "(ival=%" IVdf ")", (IV)lvalp->ival); break; case TOKENTYPE_OPNUM: Perl_sv_catpvf(aTHX_ report, "(ival=op_%s)", @@ -534,13 +534,13 @@ S_no_op(pTHX_ const char *const what, char *s) NOOP; if (t < PL_bufptr && isSPACE(*t)) Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "\t(Do you need to predeclare %"UTF8f"?)\n", + "\t(Do you need to predeclare %" UTF8f "?)\n", UTF8fARG(UTF, t - PL_oldoldbufptr, PL_oldoldbufptr)); } else { assert(s >= oldbp); Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "\t(Missing operator before %"UTF8f"?)\n", + "\t(Missing operator before %" UTF8f "?)\n", UTF8fARG(UTF, s - oldbp, oldbp)); } } @@ -590,7 +590,7 @@ S_missingterm(pTHX_ char *s) sv = sv_2mortal(newSVpv(s,0)); if (uni) SvUTF8_on(sv); - Perl_croak(aTHX_ "Can't find string terminator %c%"SVf + Perl_croak(aTHX_ "Can't find string terminator %c%" SVf "%c anywhere before EOF",q,SVfARG(sv),q); } @@ -1634,19 +1634,19 @@ Perl_validate_proto(pTHX_ SV *name, SV *proto, bool warn) if (proto_after_greedy_proto) Perl_warner(aTHX_ packWARN(WARN_ILLEGALPROTO), - "Prototype after '%c' for %"SVf" : %s", + "Prototype after '%c' for %" SVf " : %s", greedy_proto, SVfARG(name), p); if (in_brackets) Perl_warner(aTHX_ packWARN(WARN_ILLEGALPROTO), - "Missing ']' in prototype for %"SVf" : %s", + "Missing ']' in prototype for %" SVf " : %s", SVfARG(name), p); if (bad_proto) Perl_warner(aTHX_ packWARN(WARN_ILLEGALPROTO), - "Illegal character in prototype for %"SVf" : %s", + "Illegal character in prototype for %" SVf " : %s", SVfARG(name), p); if (bad_proto_after_underscore) Perl_warner(aTHX_ packWARN(WARN_ILLEGALPROTO), - "Illegal character after '_' in prototype for %"SVf" : %s", + "Illegal character after '_' in prototype for %" SVf " : %s", SVfARG(name), p); } @@ -1872,7 +1872,7 @@ S_check_uni(pTHX) return; Perl_ck_warner_d(aTHX_ packWARN(WARN_AMBIGUOUS), - "Warning: Use of \"%"UTF8f"\" without parentheses is ambiguous", + "Warning: Use of \"%" UTF8f "\" without parentheses is ambiguous", UTF8fARG(UTF, (int)(s - PL_last_uni), PL_last_uni)); } @@ -3026,7 +3026,7 @@ S_scan_const(pTHX_ char *start) else if (convert_unicode) { /* diag_listed_as: Invalid range "%s" in transliteration operator */ Perl_croak(aTHX_ - "Invalid range \"\\N{U+%04"UVXf"}-\\N{U+%04"UVXf"}\"" + "Invalid range \"\\N{U+%04" UVXf "}-\\N{U+%04" UVXf "}\"" " in transliteration operator", range_min, range_max); } @@ -3034,7 +3034,7 @@ S_scan_const(pTHX_ char *start) else { /* diag_listed_as: Invalid range "%s" in transliteration operator */ Perl_croak(aTHX_ - "Invalid range \"\\x{%04"UVXf"}-\\x{%04"UVXf"}\"" + "Invalid range \"\\x{%04" UVXf "}-\\x{%04" UVXf "}\"" " in transliteration operator", range_min, range_max); } @@ -3821,8 +3821,8 @@ S_scan_const(pTHX_ char *start) *d = '\0'; SvCUR_set(sv, d - SvPVX_const(sv)); if (SvCUR(sv) >= SvLEN(sv)) - Perl_croak(aTHX_ "panic: constant overflowed allocated space, %"UVuf - " >= %"UVuf, (UV)SvCUR(sv), (UV)SvLEN(sv)); + Perl_croak(aTHX_ "panic: constant overflowed allocated space, %" UVuf + " >= %" UVuf, (UV)SvCUR(sv), (UV)SvLEN(sv)); SvPOK_on(sv); if (has_utf8) { @@ -4534,7 +4534,7 @@ Perl_yylex(pTHX) DEBUG_T( { SV* tmp = newSVpvs(""); - PerlIO_printf(Perl_debug_log, "### %"IVdf":LEX_%s/X%s %s\n", + PerlIO_printf(Perl_debug_log, "### %" IVdf ":LEX_%s/X%s %s\n", (IV)CopLINE(PL_curcop), lex_state_names[PL_lex_state], exp_name[PL_expect], @@ -4924,7 +4924,7 @@ Perl_yylex(pTHX) } else { d = PL_linestart; } - Perl_croak(aTHX_ "Unrecognized character %s; marked by <-- HERE after %"UTF8f"<-- HERE near column %d", c, + Perl_croak(aTHX_ "Unrecognized character %s; marked by <-- HERE after %" UTF8f "<-- HERE near column %d", c, UTF8fARG(UTF, (s - d), d), (int) len + 1); } @@ -6381,7 +6381,7 @@ Perl_yylex(pTHX) while (t < PL_bufend && *t != ']') t++; Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "Multidimensional syntax %"UTF8f" not supported", + "Multidimensional syntax %" UTF8f " not supported", UTF8fARG(UTF,(int)((t - PL_bufptr) + 1), PL_bufptr)); } } @@ -6405,7 +6405,7 @@ Perl_yylex(pTHX) if (*t == ';' && get_cvn_flags(tmpbuf, len, UTF ? SVf_UTF8 : 0)) Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "You need to quote \"%"UTF8f"\"", + "You need to quote \"%" UTF8f "\"", UTF8fARG(UTF, len, tmpbuf)); } } @@ -6951,7 +6951,7 @@ Perl_yylex(pTHX) s = scan_word(s, PL_tokenbuf + len, sizeof PL_tokenbuf - len, TRUE, &morelen); if (!morelen) - Perl_croak(aTHX_ "Bad name after %"UTF8f"%s", + Perl_croak(aTHX_ "Bad name after %" UTF8f "%s", UTF8fARG(UTF, len, PL_tokenbuf), *s == '\'' ? "'" : "::"); len += morelen; @@ -6979,8 +6979,9 @@ Perl_yylex(pTHX) if (ckWARN(WARN_BAREWORD) && ! gv_fetchpvn_flags(PL_tokenbuf, len, UTF ? SVf_UTF8 : 0, SVt_PVHV)) Perl_warner(aTHX_ packWARN(WARN_BAREWORD), - "Bareword \"%"UTF8f"\" refers to nonexistent package", - UTF8fARG(UTF, len, PL_tokenbuf)); + "Bareword \"%" UTF8f + "\" refers to nonexistent package", + UTF8fARG(UTF, len, PL_tokenbuf)); len -= 2; PL_tokenbuf[len] = '\0'; gv = NULL; @@ -7281,7 +7282,7 @@ Perl_yylex(pTHX) if ((lastchar == '*' || lastchar == '%' || lastchar == '&') && saw_infix_sigil) { Perl_ck_warner_d(aTHX_ packWARN(WARN_AMBIGUOUS), - "Operator or semicolon missing before %c%"UTF8f, + "Operator or semicolon missing before %c%" UTF8f, lastchar, UTF8fARG(UTF, strlen(PL_tokenbuf), PL_tokenbuf)); @@ -7300,7 +7301,7 @@ Perl_yylex(pTHX) case KEY___LINE__: FUN0OP( newSVOP(OP_CONST, 0, - Perl_newSVpvf(aTHX_ "%"IVdf, (IV)CopLINE(PL_curcop))) + Perl_newSVpvf(aTHX_ "%" IVdf, (IV)CopLINE(PL_curcop))) ); case KEY___PACKAGE__: @@ -7405,7 +7406,7 @@ Perl_yylex(pTHX) goto just_a_word; } if (!tmp) - Perl_croak(aTHX_ "CORE::%"UTF8f" is not a keyword", + Perl_croak(aTHX_ "CORE::%" UTF8f " is not a keyword", UTF8fARG(UTF, len, PL_tokenbuf)); if (tmp < 0) tmp = -tmp; @@ -7950,7 +7951,7 @@ Perl_yylex(pTHX) && !keyword(s, d-s, 0) ) { Perl_warner(aTHX_ packWARN(WARN_PRECEDENCE), - "Precedence problem: open %"UTF8f" should be open(%"UTF8f")", + "Precedence problem: open %" UTF8f " should be open(%" UTF8f ")", UTF8fARG(UTF, d-s, s), UTF8fARG(UTF, d-s, s)); } } @@ -8380,7 +8381,7 @@ Perl_yylex(pTHX) if (!have_name) Perl_croak(aTHX_ "Illegal declaration of anonymous subroutine"); else if (*s != ';' && *s != '}') - Perl_croak(aTHX_ "Illegal declaration of subroutine %"SVf, SVfARG(PL_subname)); + Perl_croak(aTHX_ "Illegal declaration of subroutine %" SVf, SVfARG(PL_subname)); } if (have_proto) { @@ -8693,7 +8694,7 @@ S_pending_ident(pTHX) { /* Downgraded from fatal to warning 20000522 mjd */ Perl_warner(aTHX_ packWARN(WARN_AMBIGUOUS), - "Possible unintended interpolation of %"UTF8f + "Possible unintended interpolation of %" UTF8f " in string", UTF8fARG(UTF, tokenbuf_len, PL_tokenbuf)); } @@ -9174,7 +9175,7 @@ S_scan_ident(pTHX_ char *s, char *dest, STRLEN destlen, I32 ck_uni) orig_copline = CopLINE(PL_curcop); CopLINE_set(PL_curcop, tmp_copline); Perl_warner(aTHX_ packWARN(WARN_AMBIGUOUS), - "Ambiguous use of %c{%"SVf"} resolved to %c%"SVf, + "Ambiguous use of %c{%" SVf "} resolved to %c%" SVf, funny, SVfARG(tmp), funny, SVfARG(tmp)); CopLINE_set(PL_curcop, orig_copline); } @@ -11220,32 +11221,32 @@ Perl_yyerror_pvn(pTHX_ const char *const s, STRLEN len, U32 flags) Perl_sv_catpvf(aTHX_ where_sv, "\\%03o", yychar & 255); } msg = newSVpvn_flags(s, len, (flags & SVf_UTF8) | SVs_TEMP); - Perl_sv_catpvf(aTHX_ msg, " at %s line %"IVdf", ", + Perl_sv_catpvf(aTHX_ msg, " at %s line %" IVdf ", ", OutCopFILE(PL_curcop), (IV)(PL_parser->preambling == NOLINE ? CopLINE(PL_curcop) : PL_parser->preambling)); if (context) - Perl_sv_catpvf(aTHX_ msg, "near \"%"UTF8f"\"\n", + Perl_sv_catpvf(aTHX_ msg, "near \"%" UTF8f "\"\n", UTF8fARG(UTF, contlen, context)); else - Perl_sv_catpvf(aTHX_ msg, "%"SVf"\n", SVfARG(where_sv)); + Perl_sv_catpvf(aTHX_ msg, "%" SVf "\n", SVfARG(where_sv)); if (PL_multi_start < PL_multi_end && (U32)(CopLINE(PL_curcop) - PL_multi_end) <= 1) { Perl_sv_catpvf(aTHX_ msg, - " (Might be a runaway multi-line %c%c string starting on line %"IVdf")\n", + " (Might be a runaway multi-line %c%c string starting on line %" IVdf ")\n", (int)PL_multi_open,(int)PL_multi_close,(IV)PL_multi_start); PL_multi_end = 0; } if (PL_in_eval & EVAL_WARNONLY) { PL_in_eval &= ~EVAL_WARNONLY; - Perl_ck_warner_d(aTHX_ packWARN(WARN_SYNTAX), "%"SVf, SVfARG(msg)); + Perl_ck_warner_d(aTHX_ packWARN(WARN_SYNTAX), "%" SVf, SVfARG(msg)); } else qerror(msg); if (PL_error_count >= 10) { SV * errsv; if (PL_in_eval && ((errsv = ERRSV), SvCUR(errsv))) - Perl_croak(aTHX_ "%"SVf"%s has too many errors.\n", + Perl_croak(aTHX_ "%" SVf "%s has too many errors.\n", SVfARG(errsv), OutCopFILE(PL_curcop)); else Perl_croak(aTHX_ "%s has too many errors.\n", @@ -11368,10 +11369,10 @@ S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen) Perl_croak(aTHX_ "panic: utf16_textfilter called in block mode (for %d characters)", maxlen); } if (status < 0) { - Perl_croak(aTHX_ "panic: utf16_textfilter called after error (status=%"IVdf")", status); + Perl_croak(aTHX_ "panic: utf16_textfilter called after error (status=%" IVdf ")", status); } DEBUG_P(PerlIO_printf(Perl_debug_log, - "utf16_textfilter(%p,%ce): idx=%d maxlen=%d status=%"IVdf" utf16=%"UVuf" utf8=%"UVuf"\n", + "utf16_textfilter(%p,%ce): idx=%d maxlen=%d status=%" IVdf " utf16=%" UVuf " utf8=%" UVuf "\n", FPTR2DPTR(void *, S_utf16_textfilter), reverse ? 'l' : 'b', idx, maxlen, status, (UV)SvCUR(utf16_buffer), (UV)SvCUR(utf8_buffer))); @@ -11426,7 +11427,7 @@ S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen) status = FILTER_READ(idx + 1, utf16_buffer, 160 + (SvCUR(utf16_buffer) & 1)); - DEBUG_P(PerlIO_printf(Perl_debug_log, "utf16_textfilter status=%"IVdf" SvCUR(sv)=%"UVuf"\n", status, (UV)SvCUR(utf16_buffer))); + DEBUG_P(PerlIO_printf(Perl_debug_log, "utf16_textfilter status=%" IVdf " SvCUR(sv)=%" UVuf "\n", status, (UV)SvCUR(utf16_buffer))); DEBUG_P({ sv_dump(utf16_buffer); sv_dump(utf8_buffer);}); if (status < 0) { /* Error */ @@ -11462,7 +11463,7 @@ S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen) } } DEBUG_P(PerlIO_printf(Perl_debug_log, - "utf16_textfilter: returns, status=%"IVdf" utf16=%"UVuf" utf8=%"UVuf"\n", + "utf16_textfilter: returns, status=%" IVdf " utf16=%" UVuf " utf8=%" UVuf "\n", status, (UV)SvCUR(utf16_buffer), (UV)SvCUR(utf8_buffer))); DEBUG_P({ sv_dump(utf8_buffer); sv_dump(sv);}); diff --git a/universal.c b/universal.c index a9d751438d..06f595f5a7 100644 --- a/universal.c +++ b/universal.c @@ -301,7 +301,7 @@ A specialised variant of C<croak()> for emitting the usage message for xsubs works out the package name and subroutine name from C<cv>, and then calls C<croak()>. Hence if C<cv> is C<&ouch::awk>, it would call C<croak> as: - Perl_croak(aTHX_ "Usage: %"SVf"::%"SVf"(%s)", "ouch" "awk", + Perl_croak(aTHX_ "Usage: %" SVf "::%" SVf "(%s)", "ouch" "awk", "eee_yow"); =cut @@ -320,13 +320,13 @@ Perl_croak_xs_usage(const CV *const cv, const char *const params) if (HvNAME_get(stash)) /* diag_listed_as: SKIPME */ - Perl_croak_nocontext("Usage: %"HEKf"::%"HEKf"(%s)", + Perl_croak_nocontext("Usage: %" HEKf "::%" HEKf "(%s)", HEKfARG(HvNAME_HEK(stash)), HEKfARG(GvNAME_HEK(gv)), params); else /* diag_listed_as: SKIPME */ - Perl_croak_nocontext("Usage: %"HEKf"(%s)", + Perl_croak_nocontext("Usage: %" HEKf "(%s)", HEKfARG(GvNAME_HEK(gv)), params); } else { dTHX; @@ -334,7 +334,7 @@ Perl_croak_xs_usage(const CV *const cv, const char *const params) /* Pants. I don't think that it should be possible to get here. */ /* diag_listed_as: SKIPME */ - Perl_croak(aTHX_ "Usage: CODE(0x%"UVxf")(%s)", PTR2UV(cv), params); + Perl_croak(aTHX_ "Usage: CODE(0x%" UVxf ")(%s)", PTR2UV(cv), params); } } @@ -744,7 +744,7 @@ XS(XS_PerlIO_get_layers) } else { if (namok && argok) - PUSHs(sv_2mortal(Perl_newSVpvf(aTHX_ "%"SVf"(%"SVf")", + PUSHs(sv_2mortal(Perl_newSVpvf(aTHX_ "%" SVf "(%" SVf ")", SVfARG(*namsvp), SVfARG(*argsvp)))); else if (namok) @@ -37,7 +37,7 @@ static const char malformed_text[] = "Malformed UTF-8 character"; static const char unees[] = "Malformed UTF-8 character (unexpected end of string)"; static const char cp_above_legal_max[] = - "Use of code point 0x%"UVXf" is deprecated; the permissible max is 0x%"UVXf""; + "Use of code point 0x%" UVXf " is deprecated; the permissible max is 0x%" UVXf; #define MAX_NON_DEPRECATED_CP ((UV) (IV_MAX)) @@ -72,7 +72,7 @@ For details, see the description for L</uvchr_to_utf8_flags>. STMT_START { \ if (flags & UNICODE_WARN_SURROGATE) { \ Perl_ck_warner_d(aTHX_ packWARN(WARN_SURROGATE), \ - "UTF-16 surrogate U+%04"UVXf, uv); \ + "UTF-16 surrogate U+%04" UVXf, uv); \ } \ if (flags & UNICODE_DISALLOW_SURROGATE) { \ return NULL; \ @@ -83,7 +83,7 @@ For details, see the description for L</uvchr_to_utf8_flags>. STMT_START { \ if (flags & UNICODE_WARN_NONCHAR) { \ Perl_ck_warner_d(aTHX_ packWARN(WARN_NONCHAR), \ - "Unicode non-character U+%04"UVXf" is not " \ + "Unicode non-character U+%04" UVXf " is not " \ "recommended for open interchange", uv); \ } \ if (flags & UNICODE_DISALLOW_NONCHAR) { \ @@ -164,8 +164,8 @@ Perl_uvoffuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) /* Choose the more dire applicable warning */ (UNICODE_IS_ABOVE_31_BIT(uv)) - ? "Code point 0x%"UVXf" is not Unicode, and not portable" - : "Code point 0x%"UVXf" is not Unicode, may not be portable", + ? "Code point 0x%" UVXf " is not Unicode, and not portable" + : "Code point 0x%" UVXf " is not Unicode, may not be portable", uv); } if (flags & UNICODE_DISALLOW_SUPER @@ -1427,7 +1427,7 @@ Perl_utf8n_to_uvchr_error(pTHX_ const U8 *s, uv, 0); message = Perl_form(aTHX_ "%s: %s (overlong; instead use %s to represent" - " U+%0*"UVXf")", + " U+%0*" UVXf ")", malformed_text, _byte_dump_string(s0, send - s0), _byte_dump_string(tmpbuf, e - tmpbuf), @@ -1459,7 +1459,7 @@ Perl_utf8n_to_uvchr_error(pTHX_ const U8 *s, } else { message = Perl_form(aTHX_ - "UTF-16 surrogate U+%04"UVXf"", uv); + "UTF-16 surrogate U+%04" UVXf, uv); } } } @@ -1489,7 +1489,7 @@ Perl_utf8n_to_uvchr_error(pTHX_ const U8 *s, } else { message = Perl_form(aTHX_ - "Code point 0x%04"UVXf" is not" + "Code point 0x%04" UVXf " is not" " Unicode, may not be portable", uv); } @@ -1528,7 +1528,7 @@ Perl_utf8n_to_uvchr_error(pTHX_ const U8 *s, } else { message = Perl_form(aTHX_ - "Code point 0x%"UVXf" is not Unicode," + "Code point 0x%" UVXf " is not Unicode," " and not portable", uv); } @@ -1579,7 +1579,7 @@ Perl_utf8n_to_uvchr_error(pTHX_ const U8 *s, pack_warn = packWARN(WARN_NONCHAR); message = Perl_form(aTHX_ "Unicode non-character" - " U+%04"UVXf" is not recommended" + " U+%04" UVXf " is not recommended" " for open interchange", uv); } } @@ -1963,7 +1963,7 @@ Perl_utf16_to_utf8(pTHX_ U8* p, U8* d, I32 bytelen, I32 *newlen) PERL_ARGS_ASSERT_UTF16_TO_UTF8; if (bytelen & 1) - Perl_croak(aTHX_ "panic: utf16_to_utf8: odd bytelen %"UVuf, (UV)bytelen); + Perl_croak(aTHX_ "panic: utf16_to_utf8: odd bytelen %" UVuf, (UV)bytelen); pend = p + bytelen; @@ -2037,7 +2037,7 @@ Perl_utf16_to_utf8_reversed(pTHX_ U8* p, U8* d, I32 bytelen, I32 *newlen) PERL_ARGS_ASSERT_UTF16_TO_UTF8_REVERSED; if (bytelen & 1) - Perl_croak(aTHX_ "panic: utf16_to_utf8_reversed: odd bytelen %"UVuf, + Perl_croak(aTHX_ "panic: utf16_to_utf8_reversed: odd bytelen %" UVuf, (UV)bytelen); while (s < send) { @@ -2563,7 +2563,7 @@ S__to_utf8_case(pTHX_ const UV uv1, const U8 *p, U8* ustrp, STRLEN *lenp, if (ckWARN_d(WARN_SURROGATE)) { const char* desc = (PL_op) ? OP_DESC(PL_op) : normal; Perl_warner(aTHX_ packWARN(WARN_SURROGATE), - "Operation \"%s\" returns its argument for UTF-16 surrogate U+%04"UVXf"", desc, uv1); + "Operation \"%s\" returns its argument for UTF-16 surrogate U+%04" UVXf, desc, uv1); } goto cases_to_self; } @@ -2585,7 +2585,7 @@ S__to_utf8_case(pTHX_ const UV uv1, const U8 *p, U8* ustrp, STRLEN *lenp, if (ckWARN_d(WARN_NON_UNICODE)) { const char* desc = (PL_op) ? OP_DESC(PL_op) : normal; Perl_warner(aTHX_ packWARN(WARN_NON_UNICODE), - "Operation \"%s\" returns its argument for non-Unicode code point 0x%04"UVXf"", desc, uv1); + "Operation \"%s\" returns its argument for non-Unicode code point 0x%04" UVXf, desc, uv1); } goto cases_to_self; } @@ -2723,8 +2723,8 @@ S_check_locale_boundary_crossing(pTHX_ const U8* const p, const UV result, U8* c /* diag_listed_as: Can't do %s("%s") on non-UTF-8 locale; resolved to "%s". */ Perl_ck_warner(aTHX_ packWARN(WARN_LOCALE), - "Can't do %s(\"\\x{%"UVXf"}\") on non-UTF-8 locale; " - "resolved to \"\\x{%"UVXf"}\".", + "Can't do %s(\"\\x{%" UVXf "}\") on non-UTF-8 locale; " + "resolved to \"\\x{%" UVXf "}\".", OP_DESC(PL_op), original, original); @@ -3338,7 +3338,7 @@ Perl__core_swash_init(pTHX_ const char* pkg, const char* name, SV *listsv, I32 m CORE_SWASH_INIT_RETURN(NULL); } Perl_croak(aTHX_ - "Can't find Unicode property definition \"%"SVf"\"", + "Can't find Unicode property definition \"%" SVf "\"", SVfARG(retval)); NOT_REACHED; /* NOTREACHED */ } @@ -3609,7 +3609,7 @@ Perl_swash_fetch(pTHX_ SV *swash, const U8 *ptr, bool do_utf8) if (!svp || !(tmps = (U8*)SvPV(*svp, slen)) || (slen << 3) < needents) Perl_croak(aTHX_ "panic: swash_fetch got improper swatch, " - "svp=%p, tmps=%p, slen=%"UVuf", needents=%"UVuf, + "svp=%p, tmps=%p, slen=%" UVuf ", needents=%" UVuf, svp, tmps, (UV)slen, (UV)needents); } @@ -3642,7 +3642,7 @@ Perl_swash_fetch(pTHX_ SV *swash, const U8 *ptr, bool do_utf8) ((UV) tmps[off + 3]); } Perl_croak(aTHX_ "panic: swash_fetch got swatch of unexpected bit width, " - "slen=%"UVuf", needents=%"UVuf, (UV)slen, (UV)needents); + "slen=%" UVuf ", needents=%" UVuf, (UV)slen, (UV)needents); NORETURN_FUNCTION_END; } @@ -3799,7 +3799,7 @@ S_swatch_get(pTHX_ SV* swash, UV start, UV span) PERL_ARGS_ASSERT_SWATCH_GET; if (bits != 1 && bits != 8 && bits != 16 && bits != 32) { - Perl_croak(aTHX_ "panic: swatch_get doesn't expect bits %"UVuf, + Perl_croak(aTHX_ "panic: swatch_get doesn't expect bits %" UVuf, (UV)bits); } @@ -3978,7 +3978,7 @@ S_swatch_get(pTHX_ SV* swash, UV start, UV span) otherbits = (STRLEN)SvUV(*otherbitssvp); if (bits < otherbits) Perl_croak(aTHX_ "panic: swatch_get found swatch size mismatch, " - "bits=%"UVuf", otherbits=%"UVuf, (UV)bits, (UV)otherbits); + "bits=%" UVuf ", otherbits=%" UVuf, (UV)bits, (UV)otherbits); /* The "other" swatch must be destroyed after. */ other = swatch_get(*othersvp, start, span); @@ -3991,7 +3991,7 @@ S_swatch_get(pTHX_ SV* swash, UV start, UV span) if (bits == 1 && otherbits == 1) { if (slen != olen) Perl_croak(aTHX_ "panic: swatch_get found swatch length " - "mismatch, slen=%"UVuf", olen=%"UVuf, + "mismatch, slen=%" UVuf ", olen=%" UVuf, (UV)slen, (UV)olen); switch (opc) { @@ -4153,7 +4153,7 @@ Perl__swash_inversion_hash(pTHX_ SV* const swash) /* Must have at least 8 bits to get the mappings */ if (bits != 8 && bits != 16 && bits != 32) { - Perl_croak(aTHX_ "panic: swash_inversion_hash doesn't expect bits %"UVuf, + Perl_croak(aTHX_ "panic: swash_inversion_hash doesn't expect bits %" UVuf, (UV)bits); } @@ -4182,7 +4182,7 @@ Perl__swash_inversion_hash(pTHX_ SV* const swash) "unexpectedly is not a string, flags=%lu", (unsigned long)SvFLAGS(sv_to)); } - /*DEBUG_U(PerlIO_printf(Perl_debug_log, "Found mapping from %"UVXf", First char of to is %"UVXf"\n", valid_utf8_to_uvchr((U8*) char_from, 0), valid_utf8_to_uvchr((U8*) SvPVX(sv_to), 0)));*/ + /*DEBUG_U(PerlIO_printf(Perl_debug_log, "Found mapping from %" UVXf ", First char of to is %" UVXf "\n", valid_utf8_to_uvchr((U8*) char_from, 0), valid_utf8_to_uvchr((U8*) SvPVX(sv_to), 0)));*/ /* Each key in the inverse list is a mapped-to value, and the key's * hash value is a list of the strings (each in UTF-8) that map to @@ -4261,7 +4261,7 @@ Perl__swash_inversion_hash(pTHX_ SV* const swash) (U8*) SvPVX(*entryp), (U8*) SvPVX(*entryp) + SvCUR(*entryp), 0))); - /*DEBUG_U(PerlIO_printf(Perl_debug_log, "%s: %d: Adding %"UVXf" to list for %"UVXf"\n", __FILE__, __LINE__, valid_utf8_to_uvchr((U8*) SvPVX(*entryp), 0), u));*/ + /*DEBUG_U(PerlIO_printf(Perl_debug_log, "%s: %d: Adding %" UVXf " to list for %" UVXf "\n", __FILE__, __LINE__, valid_utf8_to_uvchr((U8*) SvPVX(*entryp), 0), u));*/ } } } @@ -4335,7 +4335,7 @@ Perl__swash_inversion_hash(pTHX_ SV* const swash) } entry = *entryp; uv = SvUV(entry); - /*DEBUG_U(PerlIO_printf(Perl_debug_log, "list for %"UVXf" contains %"UVXf"\n", val, uv));*/ + /*DEBUG_U(PerlIO_printf(Perl_debug_log, "list for %" UVXf " contains %" UVXf "\n", val, uv));*/ if (uv == val) { found_key = TRUE; } @@ -4353,14 +4353,14 @@ Perl__swash_inversion_hash(pTHX_ SV* const swash) /* Make sure there is a mapping to itself on the list */ if (! found_key) { av_push(list, newSVuv(val)); - /*DEBUG_U(PerlIO_printf(Perl_debug_log, "%s: %d: Adding %"UVXf" to list for %"UVXf"\n", __FILE__, __LINE__, val, val));*/ + /*DEBUG_U(PerlIO_printf(Perl_debug_log, "%s: %d: Adding %" UVXf " to list for %" UVXf "\n", __FILE__, __LINE__, val, val));*/ } /* Simply add the value to the list */ if (! found_inverse) { av_push(list, newSVuv(inverse)); - /*DEBUG_U(PerlIO_printf(Perl_debug_log, "%s: %d: Adding %"UVXf" to list for %"UVXf"\n", __FILE__, __LINE__, inverse, val));*/ + /*DEBUG_U(PerlIO_printf(Perl_debug_log, "%s: %d: Adding %" UVXf " to list for %" UVXf "\n", __FILE__, __LINE__, inverse, val));*/ } /* swatch_get() increments the value of val for each element in the @@ -4468,7 +4468,7 @@ Perl__swash_to_invlist(pTHX_ SV* const swash) /* Then just populate the rest of the input */ while (elements-- > 0) { if (l > lend) { - Perl_croak(aTHX_ "panic: Expecting %"UVuf" more elements than available", elements); + Perl_croak(aTHX_ "panic: Expecting %" UVuf " more elements than available", elements); } while (isSPACE(*l)) l++; if (!grok_atoUV((const char *)l, other_elements_ptr++, &after_atou)) { @@ -4567,7 +4567,7 @@ Perl__swash_to_invlist(pTHX_ SV* const swash) if (bits != otherbits || bits != 1) { Perl_croak(aTHX_ "panic: _swash_to_invlist only operates on boolean " - "properties, bits=%"UVuf", otherbits=%"UVuf, + "properties, bits=%" UVuf ", otherbits=%" UVuf, (UV)bits, (UV)otherbits); } @@ -4677,7 +4677,7 @@ Perl_check_utf8_print(pTHX_ const U8* s, const STRLEN len) * do for the non-chars and above-unicodes */ UV uv = utf8_to_uvchr_buf(s, e, &char_len); Perl_warner(aTHX_ packWARN(WARN_SURROGATE), - "Unicode surrogate U+%04"UVXf" is illegal in UTF-8", uv); + "Unicode surrogate U+%04" UVXf " is illegal in UTF-8", uv); ok = FALSE; } } @@ -4766,7 +4766,7 @@ Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV f } } if (!ok) - Perl_sv_catpvf(aTHX_ dsv, "\\x{%"UVxf"}", u); + Perl_sv_catpvf(aTHX_ dsv, "\\x{%" UVxf "}", u); } if (truncated) sv_catpvs(dsv, "..."); @@ -140,7 +140,7 @@ Perl_safesysmalloc(MEM_SIZE size) #endif #ifdef DEBUGGING if ((SSize_t)size < 0) - Perl_croak_nocontext("panic: malloc, size=%"UVuf, (UV) size); + Perl_croak_nocontext("panic: malloc, size=%" UVuf, (UV) size); #endif if (!size) size = 1; /* malloc(0) is NASTY on our system */ #ifdef PERL_DEBUG_READONLY_COW @@ -180,7 +180,7 @@ Perl_safesysmalloc(MEM_SIZE size) header->size = size; #endif ptr = (Malloc_t)((char*)ptr+PERL_MEMORY_DEBUG_HEADER_SIZE); - DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) malloc %ld bytes\n",PTR2UV(ptr),(long)PL_an++,(long)size)); + DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%" UVxf ": (%05ld) malloc %ld bytes\n",PTR2UV(ptr),(long)PL_an++,(long)size)); } else { @@ -257,7 +257,7 @@ Perl_safesysrealloc(Malloc_t where,MEM_SIZE size) #endif #ifdef DEBUGGING if ((SSize_t)size < 0) - Perl_croak_nocontext("panic: realloc, size=%"UVuf, (UV)size); + Perl_croak_nocontext("panic: realloc, size=%" UVuf, (UV)size); #endif #ifdef PERL_DEBUG_READONLY_COW if ((ptr = mmap(0, size, PROT_READ|PROT_WRITE, @@ -304,8 +304,8 @@ Perl_safesysrealloc(Malloc_t where,MEM_SIZE size) /* In particular, must do that fixup above before logging anything via *printf(), as it can reallocate memory, which can cause SEGVs. */ - DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) rfree\n",PTR2UV(where),(long)PL_an++)); - DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) realloc %ld bytes\n",PTR2UV(ptr),(long)PL_an++,(long)size)); + DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%" UVxf ": (%05ld) rfree\n",PTR2UV(where),(long)PL_an++)); + DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%" UVxf ": (%05ld) realloc %ld bytes\n",PTR2UV(ptr),(long)PL_an++,(long)size)); if (ptr == NULL) { #ifdef USE_MDH @@ -333,7 +333,7 @@ Perl_safesysfree(Malloc_t where) #ifdef ALWAYS_NEED_THX dTHX; #endif - DEBUG_m( PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) free\n",PTR2UV(where),(long)PL_an++)); + DEBUG_m( PerlIO_printf(Perl_debug_log, "0x%" UVxf ": (%05ld) free\n",PTR2UV(where),(long)PL_an++)); if (where) { #ifdef USE_MDH Malloc_t where_intrn = (Malloc_t)((char*)where-PERL_MEMORY_DEBUG_HEADER_SIZE); @@ -419,7 +419,7 @@ Perl_safesyscalloc(MEM_SIZE count, MEM_SIZE size) #endif #ifdef DEBUGGING if ((SSize_t)size < 0 || (SSize_t)count < 0) - Perl_croak_nocontext("panic: calloc, size=%"UVuf", count=%"UVuf, + Perl_croak_nocontext("panic: calloc, size=%" UVuf ", count=%" UVuf, (UV)size, (UV)count); #endif #ifdef PERL_DEBUG_READONLY_COW @@ -442,7 +442,7 @@ Perl_safesyscalloc(MEM_SIZE count, MEM_SIZE size) ptr = (Malloc_t)PerlMem_calloc(count ? count : 1, size ? size : 1); #endif PERL_ALLOC_CHECK(ptr); - DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) calloc %ld x %ld bytes\n",PTR2UV(ptr),(long)PL_an++,(long)count,(long)total_size)); + DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%" UVxf ": (%05ld) calloc %ld x %ld bytes\n",PTR2UV(ptr),(long)PL_an++,(long)count,(long)total_size)); if (ptr != NULL) { #ifdef USE_MDH { @@ -768,7 +768,7 @@ Perl_fbm_compile(pTHX_ SV *sv, U32 flags) } BmUSEFUL(sv) = 100; /* Initial value */ ((XPVNV*)SvANY(sv))->xnv_u.xnv_bm_tail = cBOOL(flags & FBMcf_TAIL); - DEBUG_r(PerlIO_printf(Perl_debug_log, "rarest char %c at %"UVuf"\n", + DEBUG_r(PerlIO_printf(Perl_debug_log, "rarest char %c at %" UVuf "\n", s[rarest], (UV)rarest)); } @@ -1524,7 +1524,7 @@ Perl_mess_sv(pTHX_ SV *basemsg, bool consume) cop = PL_curcop; if (CopLINE(cop)) - Perl_sv_catpvf(aTHX_ sv, " at %s line %"IVdf, + Perl_sv_catpvf(aTHX_ sv, " at %s line %" IVdf, OutCopFILE(cop), (IV)CopLINE(cop)); /* Seems that GvIO() can be untrustworthy during global destruction. */ if (GvIO(PL_last_in_gv) && (SvTYPE(GvIOp(PL_last_in_gv)) == SVt_PVIO) @@ -1533,7 +1533,7 @@ Perl_mess_sv(pTHX_ SV *basemsg, bool consume) STRLEN l; const bool line_mode = (RsSIMPLE(PL_rs) && *SvPV_const(PL_rs,l) == '\n' && l == 1); - Perl_sv_catpvf(aTHX_ sv, ", <%"SVf"> %s %"IVdf, + Perl_sv_catpvf(aTHX_ sv, ", <%" SVf "> %s %" IVdf, SVfARG(PL_last_in_gv == PL_argvgv ? &PL_sv_no : sv_2mortal(newSVhek(GvNAME_HEK(PL_last_in_gv)))), @@ -3702,7 +3702,7 @@ Perl_report_wrongway_fh(pTHX_ const GV *gv, const char have) if (name && HEK_LEN(name)) Perl_warner(aTHX_ packWARN(WARN_IO), - "Filehandle %"HEKf" opened only for %sput", + "Filehandle %" HEKf " opened only for %sput", HEKfARG(name), direction); else Perl_warner(aTHX_ packWARN(WARN_IO), @@ -3745,13 +3745,13 @@ Perl_report_evil_fh(pTHX_ const GV *gv) ? "socket" : "filehandle"); const bool have_name = name && SvCUR(name); Perl_warner(aTHX_ packWARN(warn_type), - "%s%s on %s %s%s%"SVf, func, pars, vile, type, + "%s%s on %s %s%s%" SVf, func, pars, vile, type, have_name ? " " : "", SVfARG(have_name ? name : &PL_sv_no)); if (io && IoDIRP(io) && !(IoFLAGS(io) & IOf_FAKE_DIRP)) Perl_warner( aTHX_ packWARN(warn_type), - "\t(Are you trying to call %s%s on dirhandle%s%"SVf"?)\n", + "\t(Are you trying to call %s%s on dirhandle%s%" SVf "?)\n", func, pars, have_name ? " " : "", SVfARG(have_name ? name : &PL_sv_no) ); @@ -4625,7 +4625,7 @@ Perl_parse_unicode_opts(pTHX_ const char **popt) the_end_of_the_opts_parser: if (opt & ~PERL_UNICODE_ALL_FLAGS) - Perl_croak(aTHX_ "Unknown Unicode option value %"UVuf, + Perl_croak(aTHX_ "Unknown Unicode option value %" UVuf, (UV) (opt & ~PERL_UNICODE_ALL_FLAGS)); *popt = p; @@ -4973,29 +4973,29 @@ S_mem_log_common(enum mem_log_type mlt, const UV n, switch (mlt) { case MLT_ALLOC: len = my_snprintf(buf, sizeof(buf), - "alloc: %s:%d:%s: %"IVdf" %"UVuf - " %s = %"IVdf": %"UVxf"\n", + "alloc: %s:%d:%s: %" IVdf " %" UVuf + " %s = %" IVdf ": %" UVxf "\n", filename, linenumber, funcname, n, typesize, type_name, n * typesize, PTR2UV(newalloc)); break; case MLT_REALLOC: len = my_snprintf(buf, sizeof(buf), - "realloc: %s:%d:%s: %"IVdf" %"UVuf - " %s = %"IVdf": %"UVxf" -> %"UVxf"\n", + "realloc: %s:%d:%s: %" IVdf " %" UVuf + " %s = %" IVdf ": %" UVxf " -> %" UVxf "\n", filename, linenumber, funcname, n, typesize, type_name, n * typesize, PTR2UV(oldalloc), PTR2UV(newalloc)); break; case MLT_FREE: len = my_snprintf(buf, sizeof(buf), - "free: %s:%d:%s: %"UVxf"\n", + "free: %s:%d:%s: %" UVxf "\n", filename, linenumber, funcname, PTR2UV(oldalloc)); break; case MLT_NEW_SV: case MLT_DEL_SV: len = my_snprintf(buf, sizeof(buf), - "%s_SV: %s:%d:%s: %"UVxf SV_LOG_SERIAL_FMT "\n", + "%s_SV: %s:%d:%s: %" UVxf SV_LOG_SERIAL_FMT "\n", mlt == MLT_NEW_SV ? "new" : "del", filename, linenumber, funcname, PTR2UV(sv) _SV_LOG_SERIAL_ARG(sv)); @@ -5637,7 +5637,7 @@ Perl_xs_handshake(const U32 key, void * v_my_perl, const char * file, ...) if(apiverlen != sizeof("v" PERL_API_VERSION_STRING)-1 || memNE(api_p, "v" PERL_API_VERSION_STRING, sizeof("v" PERL_API_VERSION_STRING)-1)) - Perl_croak_nocontext("Perl API version %s of %"SVf" does not match %s", + Perl_croak_nocontext("Perl API version %s of %" SVf " does not match %s", api_p, SVfARG(PL_stack_base[ax + 0]), "v" PERL_API_VERSION_STRING); } @@ -5669,10 +5669,10 @@ S_xs_version_bootcheck(pTHX_ U32 items, U32 ax, const char *xs_p, else { /* XXX GV_ADDWARN */ vn = "XS_VERSION"; - sv = get_sv(Perl_form(aTHX_ "%"SVf"::%s", SVfARG(module), vn), 0); + sv = get_sv(Perl_form(aTHX_ "%" SVf "::%s", SVfARG(module), vn), 0); if (!sv || !SvOK(sv)) { vn = "VERSION"; - sv = get_sv(Perl_form(aTHX_ "%"SVf"::%s", SVfARG(module), vn), 0); + sv = get_sv(Perl_form(aTHX_ "%" SVf "::%s", SVfARG(module), vn), 0); } } if (sv) { @@ -5682,17 +5682,17 @@ S_xs_version_bootcheck(pTHX_ U32 items, U32 ax, const char *xs_p, xssv = upg_version(xssv, 0); if ( vcmp(pmsv,xssv) ) { SV *string = vstringify(xssv); - SV *xpt = Perl_newSVpvf(aTHX_ "%"SVf" object version %"SVf + SV *xpt = Perl_newSVpvf(aTHX_ "%" SVf " object version %" SVf " does not match ", SVfARG(module), SVfARG(string)); SvREFCNT_dec(string); string = vstringify(pmsv); if (vn) { - Perl_sv_catpvf(aTHX_ xpt, "$%"SVf"::%s %"SVf, SVfARG(module), vn, + Perl_sv_catpvf(aTHX_ xpt, "$%" SVf "::%s %" SVf, SVfARG(module), vn, SVfARG(string)); } else { - Perl_sv_catpvf(aTHX_ xpt, "bootstrap parameter %"SVf, SVfARG(string)); + Perl_sv_catpvf(aTHX_ xpt, "bootstrap parameter %" SVf, SVfARG(string)); } SvREFCNT_dec(string); @@ -6604,7 +6604,7 @@ Perl_get_c_backtrace_dump(pTHX_ int depth, int skip) if (frame->source_name_size && frame->source_name_offset && frame->source_line_number) { - Perl_sv_catpvf(aTHX_ dsv, "\t%s:%"UVuf, + Perl_sv_catpvf(aTHX_ dsv, "\t%s:%" UVuf, (char*)bt + frame->source_name_offset, (UV)frame->source_line_number); } else { |