coffee/uchardet
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/uchardet/uchardet.git synced 2025-12-07 17:26:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes boolean operation precedence warnings...

Browse Source 
... and some minor space issues.
Some explicit parentheses were needed to make precedence obvious.
Warning was:
"warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]"
This commit is contained in:
Jehan 2015-11-18 19:38:12 +01:00
parent 0d70a36910
commit 35153b1e50
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/JpCntx.cpp
View File

@ -195,16 +195,16 @@ float JapaneseContextAnalysis::GetConfidence(void)
PRInt32 SJISContextAnalysis::GetOrder(const char* str, PRUint32 *charLen) PRInt32 SJISContextAnalysis::GetOrder(const char* str, PRUint32 *charLen)
{ {
//find out current char's byte length //find out current char's byte length
if ((unsigned char)*str >= (unsigned char)0x81 && (unsigned char)*str <= (unsigned char)0x9f || if (((unsigned char)*str >= (unsigned char)0x81 && (unsigned char)*str <= (unsigned char)0x9f) ||
(unsigned char)*str >= (unsigned char)0xe0 && (unsigned char)*str <= (unsigned char)0xfc ) ((unsigned char)*str >= (unsigned char)0xe0 && (unsigned char)*str <= (unsigned char)0xfc))
*charLen = 2; *charLen = 2;
else else
*charLen = 1; *charLen = 1;
//return its order if it is hiragana //return its order if it is hiragana
if (*str == '\202' && if (*str == '\202' &&
(unsigned char)*(str+1) >= (unsigned char)0x9f && (unsigned char)*(str+1) >= (unsigned char)0x9f &&
(unsigned char)*(str+1) <= (unsigned char)0xf1) (unsigned char)*(str+1) <= (unsigned char)0xf1)
return (unsigned char)*(str+1) - (unsigned char)0x9f; return (unsigned char)*(str+1) - (unsigned char)0x9f;
return -1; return -1;
} }
@ -213,17 +213,17 @@ PRInt32 EUCJPContextAnalysis::GetOrder(const char* str, PRUint32 *charLen)
{ {
//find out current char's byte length //find out current char's byte length
if ((unsigned char)*str == (unsigned char)0x8e || if ((unsigned char)*str == (unsigned char)0x8e ||
(unsigned char)*str >= (unsigned char)0xa1 && ((unsigned char)*str >= (unsigned char)0xa1 &&
(unsigned char)*str <= (unsigned char)0xfe) (unsigned char)*str <= (unsigned char)0xfe))
*charLen = 2; *charLen = 2;
else if ((unsigned char)*str == (unsigned char)0x8f) else if ((unsigned char)*str == (unsigned char)0x8f)
*charLen = 3; *charLen = 3;
else else
*charLen = 1; *charLen = 1;
//return its order if it is hiragana //return its order if it is hiragana
if ((unsigned char)*str == (unsigned char)0xa4 && if ((unsigned char)*str == (unsigned char)0xa4 &&
(unsigned char)*(str+1) >= (unsigned char)0xa1 && (unsigned char)*(str+1) >= (unsigned char)0xa1 &&
(unsigned char)*(str+1) <= (unsigned char)0xf3) (unsigned char)*(str+1) <= (unsigned char)0xf3)
return (unsigned char)*(str+1) - (unsigned char)0xa1; return (unsigned char)*(str+1) - (unsigned char)0xa1;
return -1; return -1;