diff options
| author | Xinchen Hui <laruence@php.net> | 2011-08-23 10:18:48 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-08-23 10:18:48 +0000 |
| commit | 9fb62f33822a40eb9e9b3d7cd73509a05e8ba6f8 (patch) | |
| tree | 1e630cb1fa8d010cd4ebd036f34a9a44689c99e6 /ext/mysqlnd/mysqlnd_charset.c | |
| parent | 5f38ffb1678a0ff6c41e9078becaadb997efec39 (diff) | |
| download | php-git-9fb62f33822a40eb9e9b3d7cd73509a05e8ba6f8.tar.gz | |
Sync r314808 to 5_3 branch
Eliminated compiler warnings "comparison is always false", "cast to pointer from integer of different siz" and tail zero warnings
Diffstat (limited to 'ext/mysqlnd/mysqlnd_charset.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_charset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c index 6c8e7a5cc1..191fd4ceb4 100644 --- a/ext/mysqlnd/mysqlnd_charset.c +++ b/ext/mysqlnd/mysqlnd_charset.c @@ -125,8 +125,8 @@ static unsigned int check_mb_utf8_sequence(const char *start, const char *end) if (!((start[1] ^ 0x80) < 0x40 && (start[2] ^ 0x80) < 0x40 && (start[3] ^ 0x80) < 0x40 && - (c >= 0xf1 || start[1] >= 0x90) && - (c <= 0xf3 || start[1] <= 0x8F))) + (c >= 0xf1 || start[1] >= (char)0x90) && + (c <= 0xf3 || start[1] <= (char)0x8F))) { return 0; /* invalid utf8 character */ } |