The first of these was correct, the second was actually incorrect, so fix and simplify.
This commit is contained in:
@@ -1418,7 +1418,7 @@ bool utf8_to_wchar_ec( const RString &s, unsigned &start, wchar_t &ch )
|
|||||||
start += i;
|
start += i;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
ch = (ch << 6) | byte & 0x3F;
|
ch = (ch << 6) | (byte & 0x3F);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool bValid = true;
|
bool bValid = true;
|
||||||
@@ -1850,8 +1850,7 @@ void Replace_Unicode_Markers( RString &sText )
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
int iNumDigits = 0;
|
int iNumDigits = 0;
|
||||||
while( p < sText.size() &&
|
while( p < sText.size() && bHex? isxdigit(sText[p]):isdigit(sText[p]) )
|
||||||
(bHex && isxdigit(sText[p])) || (!bHex && isdigit(sText[p])) )
|
|
||||||
{
|
{
|
||||||
p++;
|
p++;
|
||||||
iNumDigits++;
|
iNumDigits++;
|
||||||
|
|||||||
Reference in New Issue
Block a user