Skip to content

Commit 6573cd3

Browse files
committed
Revert "Attempt to remove deprecated uvuni_to_utf8()"
This reverts commit 463db48. This caused HTML::Parser to break, and looking at the code, I realized that I need to do more work before there is an acceptable alternative. Closes #23521
1 parent 731f586 commit 6573cd3

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

embed.fnc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3870,6 +3870,8 @@ Admp |U8 * |uv_to_utf8_msgs|NN U8 *d \
38703870
|UV uv \
38713871
|UV flags \
38723872
|NULLOK HV **msgs
3873+
CDbp |U8 * |uvuni_to_utf8 |NN U8 *d \
3874+
|UV uv
38733875
EXdpx |bool |validate_proto |NN SV *name \
38743876
|NULLOK SV *proto \
38753877
|bool warn \

embed.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -928,6 +928,7 @@
928928
# define utf8_to_uvchr(a,b) Perl_utf8_to_uvchr(aTHX_ a,b)
929929
# define utf8_to_uvuni(a,b) Perl_utf8_to_uvuni(aTHX_ a,b)
930930
# define utf8n_to_uvuni(a,b,c,d) Perl_utf8n_to_uvuni(aTHX_ a,b,c,d)
931+
# define uvuni_to_utf8(a,b) Perl_uvuni_to_utf8(aTHX_ a,b)
931932
# endif
932933
# if defined(PERL_CORE)
933934
# define PerlLIO_dup2_cloexec(a,b) Perl_PerlLIO_dup2_cloexec(aTHX_ a,b)

mathoms.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,14 @@ Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen)
142142
return NATIVE_TO_UNI(valid_utf8_to_uvchr(s, retlen));
143143
}
144144

145+
U8 *
146+
Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv)
147+
{
148+
PERL_ARGS_ASSERT_UVUNI_TO_UTF8;
149+
150+
return uvoffuni_to_utf8_flags(d, uv, 0);
151+
}
152+
145153
/*
146154
=for apidoc_section $unicode
147155
=for apidoc utf8n_to_uvuni

pod/perldelta.pod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,6 @@ well.
398398
Removed the deprecated (since 5.32) functions C<sv_locking()> and
399399
C<sv_unlocking>.
400400

401-
=item *
402-
403-
Removed the deprecated (since 5.32) function C<uvuni_to_utf8()>
404-
405401
=back
406402

407403
=head1 Selected Bug Fixes

proto.h

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)