mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
ctype-utf8.c, ctype-sjis.c:
Safer and mode readable way. strings/ctype-sjis.c: Safer and mode readable way. strings/ctype-utf8.c: Safer and mode readable way.
This commit is contained in:
@@ -4576,12 +4576,7 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)),
|
|||||||
const char *b0= b;
|
const char *b0= b;
|
||||||
while (pos && b < e)
|
while (pos && b < e)
|
||||||
{
|
{
|
||||||
/*
|
if ((uchar) b[0] < 128)
|
||||||
Cast to int8 for extra safety.
|
|
||||||
"char" can be unsigned by default
|
|
||||||
on some platforms.
|
|
||||||
*/
|
|
||||||
if (((int8)b[0]) >= 0)
|
|
||||||
{
|
{
|
||||||
/* Single byte ascii character */
|
/* Single byte ascii character */
|
||||||
b++;
|
b++;
|
||||||
|
@@ -2129,12 +2129,7 @@ int my_strcasecmp_utf8(CHARSET_INFO *cs, const char *s, const char *t)
|
|||||||
{
|
{
|
||||||
my_wc_t s_wc,t_wc;
|
my_wc_t s_wc,t_wc;
|
||||||
|
|
||||||
/*
|
if ((uchar) s[0] < 128)
|
||||||
Cast to int8 for extra safety.
|
|
||||||
char can be unsigned by default
|
|
||||||
on some platforms.
|
|
||||||
*/
|
|
||||||
if (((int8)s[0]) >= 0)
|
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
s[0] is between 0 and 127.
|
s[0] is between 0 and 127.
|
||||||
@@ -2181,7 +2176,7 @@ int my_strcasecmp_utf8(CHARSET_INFO *cs, const char *s, const char *t)
|
|||||||
|
|
||||||
/* Do the same for the second string */
|
/* Do the same for the second string */
|
||||||
|
|
||||||
if (((int8)t[0]) >= 0)
|
if ((uchar) t[0] < 128)
|
||||||
{
|
{
|
||||||
/* Convert single byte character into weight */
|
/* Convert single byte character into weight */
|
||||||
t_wc= plane00[(uchar) t[0]].tolower;
|
t_wc= plane00[(uchar) t[0]].tolower;
|
||||||
|
Reference in New Issue
Block a user