mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 16:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to bytes_to_utf8-type functions

Browse Source 
This commit turns bytes_to_utf8() back into an (inline) function, and
changes the type of a parameter in bytes_to_utf8_free_me() to void*,
which is a more accurate type for it.

Fixes #22902
This commit is contained in:
Karl Williamson 2025-01-19 05:29:20 -07:00 committed by Karl Williamson
parent 50d66694fd
commit 9de1a49435
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embed.fnc
View File

@ -794,12 +794,12 @@ Adp |int |bytes_cmp_utf8 |NN const U8 *b \
Adp |U8 * |bytes_from_utf8|NN const U8 *s \
|NN STRLEN *lenp \
|NN bool *is_utf8p
Admp |U8 * |bytes_to_utf8 |NN const U8 *s \
Adip |U8 * |bytes_to_utf8 |NN const U8 *s \
|NN STRLEN *lenp
Adp |U8 * |bytes_to_utf8_free_me \
|NN const U8 *s \
|NN STRLEN *lenp \
|NULLOK const U8 **free_me
|NULLOK void **free_me
AOdp |SSize_t|call_argv |NN const char *sub_name \
|I32 flags \
|NN char **argv

2
embed.h
View File

@ -155,7 +155,7 @@
# define block_start(a) Perl_block_start(aTHX_ a)
# define bytes_cmp_utf8(a,b,c,d) Perl_bytes_cmp_utf8(aTHX_ a,b,c,d)
# define bytes_from_utf8(a,b,c) Perl_bytes_from_utf8(aTHX_ a,b,c)
# define bytes_to_utf8(a,b) Perl_bytes_to_utf8(aTHX,a,b)
# define bytes_to_utf8(a,b) Perl_bytes_to_utf8(aTHX_ a,b)
# define bytes_to_utf8_free_me(a,b,c) Perl_bytes_to_utf8_free_me(aTHX_ a,b,c)
# define c9strict_utf8_to_uv Perl_c9strict_utf8_to_uv
# define call_argv(a,b,c) Perl_call_argv(aTHX_ a,b,c)

7
inline.h
View File

@ -1132,7 +1132,6 @@ in lvalue context.
=cut
*/
PERL_STATIC_INLINE bool
Perl_rpp_is_lone(pTHX_ SV *sv)
{
@ -1231,6 +1230,12 @@ Perl_append_utf8_from_native_byte(const U8 byte, U8** dest)
}
}
PERL_STATIC_INLINE U8 *
Perl_bytes_to_utf8(pTHX_ const U8 *s, STRLEN *lenp)
{
return bytes_to_utf8_free_me(s, lenp, NULL);
}
/*
=for apidoc valid_utf8_to_uvchr
Like C<L<perlapi/utf8_to_uvchr_buf>>, but should only be called when it is

10
proto.h generated
View File

@ -398,11 +398,8 @@ Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *lenp, bool *is_utf8p);
#define PERL_ARGS_ASSERT_BYTES_FROM_UTF8 \
assert(s); assert(lenp); assert(is_utf8p)
/* PERL_CALLCONV U8 *
Perl_bytes_to_utf8(pTHX_ const U8 *s, STRLEN *lenp); */
PERL_CALLCONV U8 *
Perl_bytes_to_utf8_free_me(pTHX_ const U8 *s, STRLEN *lenp, const U8 **free_me);
Perl_bytes_to_utf8_free_me(pTHX_ const U8 *s, STRLEN *lenp, void **free_me);
#define PERL_ARGS_ASSERT_BYTES_TO_UTF8_FREE_ME \
assert(s); assert(lenp)
@ -9651,6 +9648,11 @@ Perl_av_store_simple(pTHX_ AV *av, SSize_t key, SV *val);
# define PERL_ARGS_ASSERT_AV_STORE_SIMPLE \
assert(av); assert(SvTYPE(av) == SVt_PVAV)
PERL_STATIC_INLINE U8 *
Perl_bytes_to_utf8(pTHX_ const U8 *s, STRLEN *lenp);
# define PERL_ARGS_ASSERT_BYTES_TO_UTF8 \
assert(s); assert(lenp)
PERL_STATIC_INLINE void
Perl_clear_defarray_simple(pTHX_ AV *av);
# define PERL_ARGS_ASSERT_CLEAR_DEFARRAY_SIMPLE \

4
utf8.c
View File

@ -3269,7 +3269,7 @@ But when it is a non-NULL pointer, C<bytes_to_utf8_free_me> stores into it
either NULL if no memory was allocated; or a pointer to that new memory. This
allows the following convenient paradigm:
U8 * free_me;
void * free_me;
U8 converted = bytes_to_utf8_free_me(string, &len, &free_me);
...
@ -3292,7 +3292,7 @@ EBCDIC), see L</sv_recode_to_utf8>().
U8*
Perl_bytes_to_utf8_free_me(pTHX_ const U8 *s, Size_t *lenp,
const U8 ** free_me_ptr)
void ** free_me_ptr)
{
PERL_ARGS_ASSERT_BYTES_TO_UTF8_FREE_ME;
PERL_UNUSED_CONTEXT;

1
utf8.h
View File

@ -1330,7 +1330,6 @@ point's representation.
#define Perl_is_utf8_char_buf(buf, buf_end) isUTF8_CHAR(buf, buf_end)
#define Perl_bytes_to_utf8(mTHX, s, lenp) Perl_bytes_to_utf8_free_me(aTHX_ s, lenp, NULL)
typedef enum {
PL_utf8_to_bytes_overwrite = 0,
PL_utf8_to_bytes_new_memory,