ICU-535 Fixed compiler warnings on alpha
X-SVN-Rev: 6578
This commit is contained in:
parent
7b0ee1a2f3
commit
a376281ea6
@ -1286,6 +1286,9 @@ fromUnicodeCallback(UConverterFromUnicodeArgs* args,const UChar32 sourceChar,con
|
||||
int32_t* offsets = *pOffsets;
|
||||
const UChar* source = *pSource;
|
||||
unsigned char* target = *pTarget;
|
||||
|
||||
args->converter->invalidUCharLength = 0;
|
||||
|
||||
if(sourceChar>0xffff){
|
||||
args->converter->invalidUCharBuffer[args->converter->invalidUCharLength++] =(uint16_t)(((sourceChar)>>10)+0xd7c0);
|
||||
args->converter->invalidUCharBuffer[args->converter->invalidUCharLength++] =(uint16_t)(((sourceChar)&0x3ff)|0xdc00);
|
||||
@ -1327,7 +1330,6 @@ fromUnicodeCallback(UConverterFromUnicodeArgs* args,const UChar32 sourceChar,con
|
||||
args->source=saveSource;
|
||||
args->target=saveTarget;
|
||||
args->offsets=saveOffsets;
|
||||
args->converter->invalidUCharLength = 0;
|
||||
args->converter->fromUSurrogateLead=0x00;
|
||||
|
||||
}
|
||||
@ -1347,7 +1349,9 @@ toUnicodeCallback(UConverterToUnicodeArgs* args, const uint32_t sourceChar,const
|
||||
UConverterCallbackReason reason;
|
||||
int32_t currentOffset;
|
||||
int32_t saveIndex = target - args->target;
|
||||
|
||||
|
||||
args->converter->invalidCharLength=0;
|
||||
|
||||
if(sourceChar>0xff){
|
||||
currentOffset= source - args->source - 2;
|
||||
args->converter->invalidCharBuffer[args->converter->invalidCharLength++] = (char)(sourceChar>>8);
|
||||
@ -1392,7 +1396,6 @@ toUnicodeCallback(UConverterToUnicodeArgs* args, const uint32_t sourceChar,const
|
||||
args->offsets[saveIndex] += currentOffset;
|
||||
}
|
||||
}
|
||||
args->converter->invalidCharLength=0;
|
||||
target=args->target;
|
||||
*pTarget=target;
|
||||
args->source = saveSource;
|
||||
|
@ -259,7 +259,9 @@ SAVE_STATE:
|
||||
UConverterCallbackReason reason;
|
||||
int32_t currentOffset ;
|
||||
int32_t saveIndex = myTarget - args->target;
|
||||
|
||||
|
||||
args->converter->invalidCharLength=0;
|
||||
|
||||
if(targetUniChar == 0xfffe){
|
||||
reason = UCNV_UNASSIGNED;
|
||||
*err = U_INVALID_CHAR_FOUND;
|
||||
@ -298,7 +300,6 @@ SAVE_STATE:
|
||||
args->offsets[saveIndex] += currentOffset;
|
||||
}
|
||||
}
|
||||
args->converter->invalidCharLength=0;
|
||||
args->source = saveSource;
|
||||
myTarget = args->target;
|
||||
args->target = saveTarget;
|
||||
@ -489,6 +490,8 @@ getTrail:
|
||||
const UChar* saveSource = args->source;
|
||||
int32_t *saveOffsets = args->offsets;
|
||||
|
||||
args->converter->invalidUCharLength = 0;
|
||||
|
||||
if(mySourceChar>0xffff){
|
||||
args->converter->invalidUCharBuffer[args->converter->invalidUCharLength++] =(uint16_t)(((mySourceChar)>>10)+0xd7c0);
|
||||
args->converter->invalidUCharBuffer[args->converter->invalidUCharLength++] =(uint16_t)(((mySourceChar)&0x3ff)|0xdc00);
|
||||
@ -531,7 +534,6 @@ getTrail:
|
||||
args->source = saveSource;
|
||||
args->target = saveTarget;
|
||||
args->offsets = saveOffsets;
|
||||
args->converter->invalidUCharLength = 0;
|
||||
args->converter->fromUSurrogateLead=0x00;
|
||||
if (U_FAILURE (*err))
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user