Skip to content

Commit 1932805

Browse files
t-a-kkhwilliamson
authored andcommitted
Use LINE_Tf thoroughly for formatting the value of CopLINE()
The value of CopLINE() used to be formatted with various way; sometimes with `%ld` and `(long)` cast, sometimes `IVdf` and `(IV)` cast, or `%d` and so on.
1 parent be5c213 commit 1932805

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

deb.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,18 @@ Perl_vdeb(pTHX_ const char *pat, va_list *args)
8787
#ifdef DEBUGGING
8888
const char* const file = PL_curcop ? OutCopFILE(PL_curcop) : "<null>";
8989
const char* const display_file = file ? file : "<free>";
90-
long line = PL_curcop ? (long)CopLINE(PL_curcop) : NOLINE;
90+
line_t line = PL_curcop ? CopLINE(PL_curcop) : NOLINE;
9191
if (line == NOLINE)
9292
line = 0;
9393

9494
PERL_ARGS_ASSERT_VDEB;
9595

9696
if (DEBUG_v_TEST)
97-
PerlIO_printf(Perl_debug_log, "(%ld:%s:%ld)\t",
97+
PerlIO_printf(Perl_debug_log, "(%ld:%s:%" LINE_Tf ")\t",
9898
(long)PerlProc_getpid(), display_file, line);
9999
else
100-
PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", display_file, line);
100+
PerlIO_printf(Perl_debug_log, "(%s:%" LINE_Tf ")\t",
101+
display_file, line);
101102
(void) PerlIO_vprintf(Perl_debug_log, pat, *args);
102103
#else
103104
PERL_UNUSED_CONTEXT;

dump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,8 +1318,8 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const OP *o)
13181318
case OP_NEXTSTATE:
13191319
case OP_DBSTATE:
13201320
if (CopLINE(cCOPo))
1321-
S_opdump_indent(aTHX_ o, level, bar, file, "LINE = %" UVuf "\n",
1322-
(UV)CopLINE(cCOPo));
1321+
S_opdump_indent(aTHX_ o, level, bar, file, "LINE = %" LINE_Tf "\n",
1322+
CopLINE(cCOPo));
13231323

13241324
if (CopSTASHPV(cCOPo)) {
13251325
SV* tmpsv = newSVpvs_flags("", SVs_TEMP);

op.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10048,10 +10048,10 @@ Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
1004810048
GV * const db_postponed = gv_fetchpvs("DB::postponed",
1004910049
GV_ADDMULTI, SVt_PVHV);
1005010050
HV *hv;
10051-
SV * const sv = Perl_newSVpvf(aTHX_ "%s:%ld-%ld",
10051+
SV * const sv = Perl_newSVpvf(aTHX_ "%s:%ld-%" LINE_Tf,
1005210052
CopFILE(PL_curcop),
1005310053
(long)PL_subline,
10054-
(long)CopLINE(PL_curcop));
10054+
CopLINE(PL_curcop));
1005510055
if (HvNAME_HEK(PL_curstash)) {
1005610056
sv_sethek(tmpstr, HvNAME_HEK(PL_curstash));
1005710057
sv_catpvs(tmpstr, "::");
@@ -10260,9 +10260,9 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs,
1026010260
has_name = TRUE;
1026110261
} else if (PERLDB_NAMEANON && CopLINE(PL_curcop)) {
1026210262
SV * const sv = sv_newmortal();
10263-
Perl_sv_setpvf(aTHX_ sv, "%s[%s:%" IVdf "]",
10263+
Perl_sv_setpvf(aTHX_ sv, "%s[%s:%" LINE_Tf "]",
1026410264
PL_curstash ? "__ANON__" : "__ANON__::__ANON__",
10265-
CopFILE(PL_curcop), (IV)CopLINE(PL_curcop));
10265+
CopFILE(PL_curcop), CopLINE(PL_curcop));
1026610266
gv = gv_fetchsv(sv, gv_fetch_flags, SVt_PVCV);
1026710267
has_name = TRUE;
1026810268
} else if (PL_curstash) {
@@ -10656,10 +10656,10 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs,
1065610656
GV * const db_postponed = gv_fetchpvs("DB::postponed",
1065710657
GV_ADDMULTI, SVt_PVHV);
1065810658
HV *hv;
10659-
SV * const sv = Perl_newSVpvf(aTHX_ "%s:%ld-%ld",
10659+
SV * const sv = Perl_newSVpvf(aTHX_ "%s:%ld-%" LINE_Tf,
1066010660
CopFILE(PL_curcop),
1066110661
(long)PL_subline,
10662-
(long)CopLINE(PL_curcop));
10662+
CopLINE(PL_curcop));
1066310663
(void)hv_store_ent(GvHV(PL_DBsub), tmpstr, sv, 0);
1066410664
hv = GvHVn(db_postponed);
1066510665
if (HvTOTALKEYS(hv) > 0 && hv_exists_ent(hv, tmpstr, 0)) {
@@ -13973,7 +13973,7 @@ Perl_ck_entersub_args_core(pTHX_ OP *entersubop, GV *namegv, SV *protosv)
1397313973
case 'L': return newSVOP(
1397413974
OP_CONST, 0,
1397513975
Perl_newSVpvf(aTHX_
13976-
"%" IVdf, (IV)CopLINE(PL_curcop)
13976+
"%" LINE_Tf, CopLINE(PL_curcop)
1397713977
)
1397813978
);
1397913979
case 'P': return newSVOP(OP_CONST, 0,

perlio.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ PerlIO_debug(const char *fmt, ...)
362362
const char * const s = CopFILE(PL_curcop);
363363
/* Use fixed buffer as sv_catpvf etc. needs SVs */
364364
char buffer[1024];
365-
const STRLEN len1 = my_snprintf(buffer, sizeof(buffer), "%.40s:%" IVdf " ", s ? s : "(none)", (IV) CopLINE(PL_curcop));
365+
const STRLEN len1 = my_snprintf(buffer, sizeof(buffer), "%.40s:%" LINE_Tf " ", s ? s : "(none)", CopLINE(PL_curcop));
366366
# ifdef USE_QUADMATH
367367
# ifdef HAS_VSNPRINTF
368368
/* my_vsnprintf() isn't available with quadmath, but the native vsnprintf()
@@ -380,8 +380,8 @@ PerlIO_debug(const char *fmt, ...)
380380
#else
381381
const char *s = CopFILE(PL_curcop);
382382
STRLEN len;
383-
SV * const sv = Perl_newSVpvf(aTHX_ "%s:%" IVdf " ", s ? s : "(none)",
384-
(IV) CopLINE(PL_curcop));
383+
SV * const sv = Perl_newSVpvf(aTHX_ "%s:%" LINE_Tf " ",
384+
s ? s : "(none)", CopLINE(PL_curcop));
385385
Perl_sv_vcatpvf(aTHX_ sv, fmt, &ap);
386386

387387
s = SvPV_const(sv, len);

pp_ctl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4693,9 +4693,9 @@ PP(pp_entereval)
46934693

46944694
if (PERLDB_NAMEEVAL && CopLINE(PL_curcop)) {
46954695
SV * const temp_sv = sv_newmortal();
4696-
Perl_sv_setpvf(aTHX_ temp_sv, "_<(eval %lu)[%s:%" IVdf "]",
4696+
Perl_sv_setpvf(aTHX_ temp_sv, "_<(eval %lu)[%s:%" LINE_Tf "]",
46974697
(unsigned long)++PL_evalseq,
4698-
CopFILE(PL_curcop), (IV)CopLINE(PL_curcop));
4698+
CopFILE(PL_curcop), CopLINE(PL_curcop));
46994699
tmpbuf = SvPVX(temp_sv);
47004700
len = SvCUR(temp_sv);
47014701
}

toke.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7755,7 +7755,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct
77557755
case KEY___LINE__:
77567756
FUN0OP(
77577757
newSVOP(OP_CONST, 0,
7758-
Perl_newSVpvf(aTHX_ "%" IVdf, (IV)CopLINE(PL_curcop)))
7758+
Perl_newSVpvf(aTHX_ "%" LINE_Tf, CopLINE(PL_curcop)))
77597759
);
77607760

77617761
case KEY___PACKAGE__:
@@ -12626,9 +12626,9 @@ Perl_yyerror_pvn(pTHX_ const char *const s, STRLEN len, U32 flags)
1262612626
Perl_sv_catpvf(aTHX_ where_sv, "\\%03o", yychar & 255);
1262712627
}
1262812628
msg = newSVpvn_flags(s, len, (flags & SVf_UTF8) | SVs_TEMP);
12629-
Perl_sv_catpvf(aTHX_ msg, " at %s line %" IVdf ", ",
12629+
Perl_sv_catpvf(aTHX_ msg, " at %s line %" LINE_Tf ", ",
1263012630
OutCopFILE(PL_curcop),
12631-
(IV)(PL_parser->preambling == NOLINE
12631+
(PL_parser->preambling == NOLINE
1263212632
? CopLINE(PL_curcop)
1263312633
: PL_parser->preambling));
1263412634
if (context)

util.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,8 +1742,8 @@ Perl_mess_sv(pTHX_ SV *basemsg, bool consume)
17421742
cop = PL_curcop;
17431743

17441744
if (CopLINE(cop))
1745-
Perl_sv_catpvf(aTHX_ sv, " at %s line %" IVdf,
1746-
OutCopFILE(cop), (IV)CopLINE(cop));
1745+
Perl_sv_catpvf(aTHX_ sv, " at %s line %" LINE_Tf,
1746+
OutCopFILE(cop), CopLINE(cop));
17471747
}
17481748

17491749
/* Seems that GvIO() can be untrustworthy during global destruction. */
@@ -5233,7 +5233,7 @@ S_mem_log_common(enum mem_log_type mlt, const UV n,
52335233
#ifdef USE_C_BACKTRACE
52345234
if(strchr(pmlenv,'c') && (mlt == MLT_NEW_SV)) {
52355235
len = my_snprintf(buf, sizeof(buf),
5236-
" caller %s at %s line %d\n",
5236+
" caller %s at %s line %" LINE_Tf "\n",
52375237
/* CopSTASHPV can crash early on startup; use CopFILE to check */
52385238
CopFILE(PL_curcop) ? CopSTASHPV(PL_curcop) : "<unknown>",
52395239
CopFILE(PL_curcop), CopLINE(PL_curcop));

0 commit comments

Comments
 (0)