summaryrefslogtreecommitdiff
path: root/utf8.c
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2017-06-09 11:44:58 -0600
committerKarl Williamson <khw@cpan.org>2017-06-14 11:08:24 -0600
commit41ae60897350f0b7028765b91dead2d244b1176f (patch)
tree272defc110874b3eeb4b26d7906a72471b16962e /utf8.c
parent74102a88afc9d8f1973892ce66cf9a83e79d043a (diff)
downloadperl-41ae60897350f0b7028765b91dead2d244b1176f.tar.gz
bytes_from_utf8(): parameter must not be NULL
The function assumes that the parameter is not NULL. Declare that to embed.fnc. Also change the name to indicate that it is a pointer.
Diffstat (limited to 'utf8.c')
-rw-r--r--utf8.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/utf8.c b/utf8.c
index e8e143c49e..aeda0d7c40 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1975,17 +1975,17 @@ Perl_utf8_to_bytes(pTHX_ U8 *s, STRLEN *lenp)
=for apidoc bytes_from_utf8
Converts a potentially UTF-8 encoded string C<s> of length C<*lenp> into native
-byte encoding. On input, the boolean C<*is_utf8> gives whether or not C<s> is
+byte encoding. On input, the boolean C<*is_utf8p> gives whether or not C<s> is
actually encoded in UTF-8.
Unlike L</utf8_to_bytes> but like L</bytes_to_utf8>, this is non-destructive of
the input string.
-Do nothing if C<*is_utf8> is 0, or if there are code points in the string
-not expressible in native byte encoding. In these cases, C<*is_utf8> and
+Do nothing if C<*is_utf8p> is 0, or if there are code points in the string
+not expressible in native byte encoding. In these cases, C<*is_utf8p> and
C<*lenp> are unchanged, and the return value is the original C<s>.
-Otherwise, C<*is_utf8> is set to 0, and the return value is a pointer to a
+Otherwise, C<*is_utf8p> is set to 0, and the return value is a pointer to a
newly created string containing a downgraded copy of C<s>, and whose length is
returned in C<*lenp>, updated.
@@ -1997,7 +1997,7 @@ value of C<*lenp> from it.
*/
U8 *
-Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *lenp, bool *is_utf8)
+Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *lenp, bool *is_utf8p)
{
U8 *d;
const U8 *start = s;
@@ -2006,7 +2006,7 @@ Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *lenp, bool *is_utf8)
PERL_ARGS_ASSERT_BYTES_FROM_UTF8;
PERL_UNUSED_CONTEXT;
- if (!*is_utf8)
+ if (!*is_utf8p)
return (U8 *)start;
/* ensure valid UTF-8 and chars < 256 before converting string */
@@ -2021,7 +2021,7 @@ Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *lenp, bool *is_utf8)
s++;
}
- *is_utf8 = FALSE;
+ *is_utf8p = FALSE;
Newx(d, (*lenp) - count + 1, U8);