Skip to content

Commit 8cc68d7

Browse files
committed
Convert Perl utf16 to utf8 functions to macros
These functions are hereby removed in favor of calling the plain macros that already exist
1 parent 09a0707 commit 8cc68d7

File tree

4 files changed

+14
-28
lines changed

4 files changed

+14
-28
lines changed

embed.fnc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3785,7 +3785,7 @@ Adip |bool |utf8_to_bytes_overwrite \
37853785
Adip |bool |utf8_to_bytes_temp_pv \
37863786
|NN U8 const **s_ptr \
37873787
|NN STRLEN *lenp
3788-
EMXp |U8 * |utf16_to_utf8 |NN U8 *p \
3788+
Emp |U8 * |utf16_to_utf8 |NN U8 *p \
37893789
|NN U8 *d \
37903790
|Size_t bytelen \
37913791
|NN Size_t *newlen
@@ -3803,7 +3803,7 @@ EXpx |U8 * |utf8_to_utf16_base \
38033803
|NN Size_t *newlen \
38043804
|const bool high \
38053805
|const bool low
3806-
EMXp |U8 * |utf16_to_utf8_reversed \
3806+
Emp |U8 * |utf16_to_utf8_reversed \
38073807
|NN U8 *p \
38083808
|NN U8 *d \
38093809
|Size_t bytelen \

embed.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,6 +2377,10 @@
23772377
# define Perl_whichsig(mTHX,a) whichsig(a)
23782378
# define thread_locale_init() Perl_thread_locale_init(aTHX)
23792379
# define thread_locale_term() Perl_thread_locale_term(aTHX)
2380+
# if defined(PERL_CORE) || defined(PERL_EXT)
2381+
# define Perl_utf16_to_utf8(mTHX,a,b,c,d) utf16_to_utf8(a,b,c,d)
2382+
# define Perl_utf16_to_utf8_reversed(mTHX,a,b,c,d) utf16_to_utf8_reversed(a,b,c,d)
2383+
# endif
23802384
# if defined(PERL_DONT_CREATE_GVSV)
23812385
# define Perl_gv_SVadd(mTHX,a) gv_SVadd(a)
23822386
# endif
@@ -2476,6 +2480,10 @@
24762480
# define Perl_uvchr_to_utf8_flags_msgs uvchr_to_utf8_flags_msgs
24772481
# define Perl_uvoffuni_to_utf8_flags uvoffuni_to_utf8_flags
24782482
# define Perl_whichsig whichsig
2483+
# if defined(PERL_CORE) || defined(PERL_EXT)
2484+
# define Perl_utf16_to_utf8 utf16_to_utf8
2485+
# define Perl_utf16_to_utf8_reversed utf16_to_utf8_reversed
2486+
# endif
24792487
# if defined(PERL_DONT_CREATE_GVSV)
24802488
# define Perl_gv_SVadd gv_SVadd
24812489
# endif

proto.h

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

utf8.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3455,22 +3455,6 @@ Perl_utf16_to_utf8_base(pTHX_ U8* p, U8* d, Size_t bytelen, Size_t *newlen,
34553455
return d;
34563456
}
34573457

3458-
U8*
3459-
Perl_utf16_to_utf8(pTHX_ U8* p, U8* d, Size_t bytelen, Size_t *newlen)
3460-
{
3461-
PERL_ARGS_ASSERT_UTF16_TO_UTF8;
3462-
3463-
return utf16_to_utf8(p, d, bytelen, newlen);
3464-
}
3465-
3466-
U8*
3467-
Perl_utf16_to_utf8_reversed(pTHX_ U8* p, U8* d, Size_t bytelen, Size_t *newlen)
3468-
{
3469-
PERL_ARGS_ASSERT_UTF16_TO_UTF8_REVERSED;
3470-
3471-
return utf16_to_utf8_reversed(p, d, bytelen, newlen);
3472-
}
3473-
34743458
/*
34753459
* Convert UTF-8 to native UTF-16. Called via the macros utf8_to_utf16() for
34763460
* big-endian and utf8_to_utf16_reversed() for little-endian,

0 commit comments

Comments
 (0)