In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/26b0dc0c52fbcb48a1f10935a8dd8f0b0d4c9209?hp=7a94a5fe7ff9b21c7fdbed392f68739f9cf48ffc>
- Log ----------------------------------------------------------------- commit 26b0dc0c52fbcb48a1f10935a8dd8f0b0d4c9209 Author: Tony Cook <[email protected]> Date: Thu Mar 14 10:19:04 2019 +1100 there is no sv_catpvfn() Replace in various documentation and messages appropriately. ----------------------------------------------------------------------- Summary of changes: ext/XS-APItest/t/svcatpvf.t | 2 +- pod/perldiag.pod | 4 ++-- sv.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/XS-APItest/t/svcatpvf.t b/ext/XS-APItest/t/svcatpvf.t index 15348891bf..865020da30 100644 --- a/ext/XS-APItest/t/svcatpvf.t +++ b/ext/XS-APItest/t/svcatpvf.t @@ -16,6 +16,6 @@ for my $case (@cases) { my ($what, $format) = @$case; my $got = eval { test_sv_catpvf($format); 1 }; my $exn = $got ? undef : $@; - like($exn, qr/\b\QCannot yet reorder sv_catpvfn() arguments from va_list\E\b/, + like($exn, qr/\b\QCannot yet reorder sv_vcatpvfn() arguments from va_list\E\b/, "explicit $what index forbidden in va_list arguments"); } diff --git a/pod/perldiag.pod b/pod/perldiag.pod index e0e56cbaae..eb24f14220 100644 --- a/pod/perldiag.pod +++ b/pod/perldiag.pod @@ -734,9 +734,9 @@ keep a reference count on its arguments and cannot be made to do so. Such arrays are not even supposed to be accessible to Perl code, but are only used internally. -=item Cannot yet reorder sv_catpvfn() arguments from va_list +=item Cannot yet reorder sv_vcatpvfn() arguments from va_list -(F) Some XS code tried to use C<sv_catpvfn()> or a related function with a +(F) Some XS code tried to use C<sv_vcatpvfn()> or a related function with a format string that specifies explicit indexes for some of the elements, and using a C-style variable-argument list (a C<va_list>). This is not currently supported. XS authors wanting to do this must instead construct a C array diff --git a/sv.c b/sv.c index 2123cf497b..e9a46827d3 100644 --- a/sv.c +++ b/sv.c @@ -10872,8 +10872,8 @@ Perl_sv_catpvf_mg_nocontext(SV *const sv, const char *const pat, ...) /* =for apidoc sv_catpvf -Processes its arguments like C<sv_catpvfn>, and appends the formatted -output to an SV. As with C<sv_catpvfn> called with a non-null C-style +Processes its arguments like C<sprintf>, and appends the formatted +output to an SV. As with C<sv_vcatpvfn> called with a non-null C-style variable argument list, argument reordering is not supported. If the appended data contains "wide" characters (including, but not limited to, SVs with a UTF-8 PV formatted with C<%s>, @@ -10899,7 +10899,7 @@ Perl_sv_catpvf(pTHX_ SV *const sv, const char *const pat, ...) /* =for apidoc sv_vcatpvf -Processes its arguments like C<sv_catpvfn> called with a non-null C-style +Processes its arguments like C<sv_vcatpvfn> called with a non-null C-style variable argument list, and appends the formatted output to an SV. Does not handle 'set' magic. See C<L</sv_vcatpvf_mg>>. @@ -12047,7 +12047,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p if (*q == '$') { if (args) Perl_croak_nocontext( - "Cannot yet reorder sv_catpvfn() arguments from va_list"); + "Cannot yet reorder sv_vcatpvfn() arguments from va_list"); ++q; efix = (Size_t)width; width = 0; @@ -12115,7 +12115,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p if (*q++ == '$') { if (args) Perl_croak_nocontext( - "Cannot yet reorder sv_catpvfn() arguments from va_list"); + "Cannot yet reorder sv_vcatpvfn() arguments from va_list"); no_redundant_warning = TRUE; } else goto unknown; @@ -12200,7 +12200,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p if (*q++ == '$') { if (args) Perl_croak_nocontext( - "Cannot yet reorder sv_catpvfn() arguments from va_list"); + "Cannot yet reorder sv_vcatpvfn() arguments from va_list"); no_redundant_warning = TRUE; } else goto unknown; -- Perl5 Master Repository
