Skip to content

Commit b7e4f70

Browse files
Leontmauke
authored andcommitted
Stop calling Perl_sv_setpvf manually
Call sv_setpvf instead.
1 parent ba04a90 commit b7e4f70

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

dquote.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Perl_form_alien_digit_msg(pTHX_
117117

118118
/* It also isn't a UTF-8 invariant character, so no display shortcuts
119119
* are available. Use \\x{...} */
120-
Perl_sv_setpvf(aTHX_ display_char, "\\x{%02x}", *first_bad);
120+
sv_setpvf(display_char, "\\x{%02x}", *first_bad);
121121
}
122122

123123
/* Ready to start building the message */
@@ -216,7 +216,7 @@ Perl_form_cp_too_large_msg(pTHX_
216216
prefix = "0x";
217217
}
218218

219-
Perl_sv_setpvf(aTHX_ message_sv, "Use of code point %s", prefix);
219+
sv_setpvf(message_sv, "Use of code point %s", prefix);
220220
if (string) {
221221
sv_catpvf(message_sv, "%.*s", (int) len, string);
222222
}

hv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,7 @@ Perl_hv_bucket_ratio(pTHX_ HV *hv)
12721272

12731273
if (HvUSEDKEYS((HV *)hv)) {
12741274
sv = sv_newmortal();
1275-
Perl_sv_setpvf(aTHX_ sv, "%ld/%ld",
1275+
sv_setpvf(sv, "%ld/%ld",
12761276
(long)HvFILL(hv), (long)HvMAX(hv) + 1);
12771277
}
12781278
else

locale.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7075,7 +7075,7 @@ S_emulate_langinfo(pTHX_ const PERL_INTMAX_T item,
70757075

70767076
const char * orig_CTYPE_locale;
70777077
orig_CTYPE_locale = toggle_locale_c(LC_CTYPE, locale);
7078-
Perl_sv_setpvf(aTHX_ sv, CODE_PAGE_FORMAT, CODE_PAGE_FUNCTION);
7078+
sv_setpvf(sv, CODE_PAGE_FORMAT, CODE_PAGE_FUNCTION);
70797079
retval_type = RETVAL_IN_sv;
70807080

70817081
/* We just assume the codeset is ASCII; no need to check for it being

op.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11076,7 +11076,7 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs,
1107611076
has_name = TRUE;
1107711077
} else if (PERLDB_NAMEANON && CopLINE(PL_curcop)) {
1107811078
SV * const sv = sv_newmortal();
11079-
Perl_sv_setpvf(aTHX_ sv, "%s[%s:%" LINE_Tf "]",
11079+
sv_setpvf(sv, "%s[%s:%" LINE_Tf "]",
1108011080
PL_curstash ? "__ANON__" : "__ANON__::__ANON__",
1108111081
CopFILE(PL_curcop), CopLINE(PL_curcop));
1108211082
gv = gv_fetchsv(sv, gv_fetch_flags, SVt_PVCV);

pp_ctl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4859,7 +4859,7 @@ S_require_file(pTHX_ SV *sv)
48594859
}
48604860
}
48614861

4862-
Perl_sv_setpvf(aTHX_ namesv, "/loader/0x%" UVxf "/%s",
4862+
sv_setpvf(namesv, "/loader/0x%" UVxf "/%s",
48634863
diruv, name);
48644864
tryname = SvPVX_const(namesv);
48654865
tryrsfp = NULL;
@@ -5099,7 +5099,7 @@ S_require_file(pTHX_ SV *sv)
50995099
sv_catpv(namesv, unixname);
51005100
#else
51015101
/* The equivalent of
5102-
Perl_sv_setpvf(aTHX_ namesv, "%s/%s", dir, name);
5102+
sv_setpvf(namesv, "%s/%s", dir, name);
51035103
but without the need to parse the format string, or
51045104
call strlen on either pointer, and with the correct
51055105
allocation up front. */
@@ -5440,7 +5440,7 @@ PP(pp_entereval)
54405440

54415441
if (PERLDB_NAMEEVAL && CopLINE(PL_curcop)) {
54425442
SV * const temp_sv = sv_newmortal();
5443-
Perl_sv_setpvf(aTHX_ temp_sv, "_<(eval %lu)[%s:%" LINE_Tf "]",
5443+
sv_setpvf(temp_sv, "_<(eval %lu)[%s:%" LINE_Tf "]",
54445444
(unsigned long)++PL_evalseq,
54455445
CopFILE(PL_curcop), CopLINE(PL_curcop));
54465446
tmpbuf = SvPVX(temp_sv);

regcomp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16343,7 +16343,7 @@ S_handle_names_wildcard(pTHX_ const char * wname, /* wildcard name to match */
1634316343
for (j = low; j <= high; j++) { /* For each code point in the series */
1634416344

1634516345
/* Get its name, and see if it matches the subpattern */
16346-
Perl_sv_setpvf(aTHX_ algo_name, "%s-%X", SvPVX(prefix),
16346+
sv_setpvf(algo_name, "%s-%X", SvPVX(prefix),
1634716347
(unsigned) j);
1634816348

1634916349
if (execute_wildcard(subpattern_re,

sv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13770,7 +13770,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p
1377013770
&& ckWARN(WARN_PRINTF))
1377113771
{
1377213772
SV * const msg = sv_newmortal();
13773-
Perl_sv_setpvf(aTHX_ msg, "Invalid conversion in %sprintf: ",
13773+
sv_setpvf(msg, "Invalid conversion in %sprintf: ",
1377413774
(PL_op->op_type == OP_PRTF) ? "" : "s");
1377513775
if (fmtstart < patend) {
1377613776
const char * const fmtend = q < patend ? q : patend;

0 commit comments

Comments
 (0)