corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove mShiftTable from encoders/decoders that don't use it and various other pieces of stale code. Bug 336575, r=jshin, rs=roc

Browse Source
This commit is contained in:
smontagu@smontagu.org
2006-08-07 07:57:31 +00:00
parent 39375d5ed4
commit b0706df668
181 changed files with 564 additions and 1890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
intl/uconv/util/nsUnicodeDecodeHelper.cpp
View File

@@ -47,7 +47,8 @@ nsresult nsUnicodeDecodeHelper::ConvertByTable(
PRInt32 * aSrcLength,
PRUnichar * aDest,
PRInt32 * aDestLength,
uShiftTable * aShiftTable,
uScanClassID aScanClass,
uShiftInTable * aShiftInTable,
uMappingTable * aMappingTable)
{
const char * src = aSrc;
@@ -60,8 +61,18 @@ nsresult nsUnicodeDecodeHelper::ConvertByTable(
nsresult res = NS_OK;
while ((srcLen > 0) && (dest < destEnd)) {
if (!uScan(aShiftTable, NULL, (PRUint8 *)src, NS_REINTERPRET_CAST(PRUint16*, &med), srcLen,
(PRUint32 *)&bcr)) {
PRBool charFound;
if (aScanClass == uMultibytesCharset) {
NS_ASSERTION(aShiftInTable, "shift table missing");
charFound = uScanShift(aShiftInTable, NULL, (PRUint8 *)src,
NS_REINTERPRET_CAST(PRUint16*, &med), srcLen,
(PRUint32 *)&bcr);
} else {
charFound = uScan(aScanClass, NULL, (PRUint8 *)src,
NS_REINTERPRET_CAST(PRUint16*, &med),
srcLen, (PRUint32 *)&bcr);
}
if (!charFound) {
res = NS_OK_UDEC_MOREINPUT;
break;
}
@@ -95,7 +106,7 @@ nsresult nsUnicodeDecodeHelper::ConvertByMultiTable(
PRInt32 * aDestLength,
PRInt32 aTableCount,
const uRange * aRangeArray,
uShiftTable ** aShiftTable,
uScanClassID * aScanClassArray,
uMappingTable ** aMappingTable)
{
PRUint8 * src = (PRUint8 *)aSrc;
@@ -118,7 +129,7 @@ nsresult nsUnicodeDecodeHelper::ConvertByMultiTable(
if ((aRangeArray[i].min <= *src) && (*src <= aRangeArray[i].max))
{
passRangeCheck = PR_TRUE;
if (uScan(aShiftTable[i], NULL, src,
if (uScan(aScanClassArray[i], NULL, src,
NS_REINTERPRET_CAST(PRUint16*, &med), srcLen,
(PRUint32 *)&bcr))
{
@@ -150,7 +161,7 @@ nsresult nsUnicodeDecodeHelper::ConvertByMultiTable(
{
if ((aRangeArray[i].min <= *src) && (*src <= aRangeArray[i].max))
{
if (uScan(aShiftTable[i], NULL, src,
if (uScan(aScanClassArray[i], NULL, src,
NS_REINTERPRET_CAST(PRUint16*, &med), srcLen,
(PRUint32*)&bcr))
{
@@ -216,7 +227,6 @@ nsresult nsUnicodeDecodeHelper::ConvertByFastTable(
}
nsresult nsUnicodeDecodeHelper::CreateFastTable(
uShiftTable * aShiftTable,
uMappingTable * aMappingTable,
PRUnichar * aFastTable,
PRInt32 aTableSize)
@@ -229,7 +239,7 @@ nsresult nsUnicodeDecodeHelper::CreateFastTable(
char * p = buff;
for (PRInt32 i=0; i<aTableSize; i++) *(p++) = i;
nsresult res = ConvertByTable(buff, &buffSize, aFastTable, &tableSize,
aShiftTable, aMappingTable);
u1ByteCharset, nsnull, aMappingTable);
delete [] buff;
return res;