summaryrefslogtreecommitdiff
path: root/utf8.c
diff options
context:
space:
mode:
authorAndy Lester <andy@petdance.com>2005-10-04 10:16:05 -0500
committerH.Merijn Brand <h.m.brand@xs4all.nl>2005-10-05 15:34:09 +0000
commit44f8325f4c9b3aaf24b47f4da7dce3e8170dcf42 (patch)
tree79ae96444551bc3a112d7601282f544236b6cdfb /utf8.c
parent5f0135ebccd6cdb2441aabb64baa39aea87199d3 (diff)
downloadperl-44f8325f4c9b3aaf24b47f4da7dce3e8170dcf42.tar.gz
Re: [PATCH] Random constings and printf cleanup
Message-ID: <20051004201605.GA31682@petdance.com> p4raw-id: //depot/perl@25693
Diffstat (limited to 'utf8.c')
-rw-r--r--utf8.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/utf8.c b/utf8.c
index 2a88a4503f..66642c5fa1 100644
--- a/utf8.c
+++ b/utf8.c
@@ -240,7 +240,7 @@ will be returned if it is valid, otherwise 0.
STRLEN
Perl_is_utf8_char(pTHX_ const U8 *s)
{
- STRLEN len = UTF8SKIP(s);
+ const STRLEN len = UTF8SKIP(s);
#ifdef IS_UTF8_CHAR
if (IS_UTF8_CHAR_FAST(len))
return IS_UTF8_CHAR(s, len) ? len : 0;
@@ -267,7 +267,7 @@ Perl_is_utf8_string(pTHX_ const U8 *s, STRLEN len)
const U8* x = s;
const U8* send;
- if (!len && s)
+ if (!len)
len = strlen((const char *)s);
send = s + len;
@@ -323,7 +323,7 @@ Perl_is_utf8_string_loclen(pTHX_ const U8 *s, STRLEN len, const U8 **ep, STRLEN
const U8* send;
STRLEN c;
- if (!len && s)
+ if (!len)
len = strlen((const char *)s);
send = s + len;
if (el)
@@ -543,7 +543,7 @@ malformed:
}
if (dowarn) {
- SV* sv = sv_2mortal(newSVpv("Malformed UTF-8 character ", 0));
+ SV* const sv = sv_2mortal(newSVpv("Malformed UTF-8 character ", 0));
switch (warning) {
case 0: /* Intentionally empty. */ break;
@@ -590,7 +590,7 @@ malformed:
}
if (warning) {
- const char *s = SvPVX_const(sv);
+ const char * const s = SvPVX_const(sv);
if (PL_op)
Perl_warner(aTHX_ packWARN(WARN_UTF8),