organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 14:31:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-634 Changed options parameter of open function

Browse source 
X-SVN-Rev: 3039
This commit is contained in:
Ram Viswanadha 2000-11-29 01:04:03 +00:00
parent e0da266893
commit 63c40580a6
6 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
icu4c/source/common/ucnv2022.c
View file

@ -15,14 +15,14 @@
*
* 06/29/2000 helena Major rewrite of the callback APIs.
* 08/08/2000 Ram Included support for ISO-2022-JP-2
* Changed implementation of toUnicode
* function
* Changed implementation of toUnicode
* function
* 08/21/2000 Ram Added support for ISO-2022-KR
* 08/29/2000 Ram Seperated implementation of EBCDIC to
* ucnvebdc.c
* ucnvebdc.c
* 09/20/2000 Ram Added support for ISO-2022-CN
* Added implementations for getNextUChar()
* for specific 2022 country variants.
* Added implementations for getNextUChar()
* for specific 2022 country variants.
* 10/31/2000 Ram Implemented offsets logic functions
*/
@ -340,7 +340,7 @@ UCNV_TableStates_2022 getKey_2022(char source,
int32_t* offset);
/*********** ISO 2022 Converter Protos ***********/
static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t* version, UErrorCode *errorCode);
static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t options, UErrorCode *errorCode);
static void _ISO2022Close(UConverter *converter);
static void _ISO2022Reset(UConverter *converter);
static const char* _ISO2022getName(const UConverter* cnv);
@ -496,7 +496,7 @@ const UConverterSharedData _ISO2022CNData={
/**********/
static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t* options, UErrorCode *errorCode){
static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t options, UErrorCode *errorCode){
char myLocale[6]={' ',' ',' ',' ',' ',' '};
@ -540,7 +540,7 @@ static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,u
uprv_strcpy(myConverterData->locale,"ja");
uprv_strcpy(myConverterData->name,"ISO_2022,locale=ja");
if(options){
switch (*options & UCNV_OPTIONS_VERSION_MASK){
switch (options & UCNV_OPTIONS_VERSION_MASK){
case 0:
myConverterData->version = 0;
break;
@ -599,7 +599,7 @@ static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,u
uprv_strcpy(myConverterData->name,"ISO_2022,locale=cn");
if(options){
switch (*options & UCNV_OPTIONS_VERSION_MASK){
switch (options & UCNV_OPTIONS_VERSION_MASK){
case 0:
myConverterData->version = 0;
break;
@ -1086,7 +1086,7 @@ static const char* getEndOfBuffer_2022(const char** source,
/**************************************ISO-2022-JP*************************************************/
/************************************** IMPORTANT **************************************************
* The T_fromUnicode_ISO2022_JP converter doesnot use ucnv_fromUnicode() functions for SBCS,DBCS and
* The UConverter_fromUnicode_ISO2022_JP converter doesnot use ucnv_fromUnicode() functions for SBCS,DBCS and
* MBCS instead the values are obtained directly by accessing the sharedData structs through ucmp8_getU()
* ucmp16_getU() macros,and for MBCS by emulating the Markus's code to increase speed, reduce the
* overhead of function call and make it efficient.The converter iterates over each Unicode codepoint
@ -3431,7 +3431,7 @@ U_CFUNC void UConverter_fromUnicode_ISO_2022_CN(UConverterFromUnicodeArgs* args,
isEscapeAppended =(UBool) myConverterData->isEscapeAppended;
isShiftAppended =(UBool) myConverterData->isShiftAppended;
initIterState = myConverterData->fromUnicodeCurrentState;
initIterState = (StateEnumCN)myConverterData->fromUnicodeCurrentState;
/* arguments check*/
if ((args->converter == NULL) || (args->targetLimit < args->target) || (args->sourceLimit < args->source)){
*err = U_ILLEGAL_ARGUMENT_ERROR;
@ -3571,7 +3571,7 @@ getTrail:
}
if(targetUniChar==missingCharMarker){
iterCount = (iterCount<3)? iterCount+1 : 0;
myConverterData->fromUnicodeCurrentState=currentState=(StateEnum)(currentState<3)? currentState+1:0;
myConverterData->fromUnicodeCurrentState=currentState=(StateEnumCN)(currentState<3)? currentState+1:0;
currentState =(StateEnumCN) myConverterData->fromUnicodeCurrentState;
myConverterData->fromUnicodeConverter = (myConverterData->fromUnicodeConverter == NULL) ?
myConverterData->myConverterArray[0] :
@ -3666,7 +3666,7 @@ CALLBACK:
args->source=saveSource;
args->target=saveTarget;
args->converter->fromUSurrogateLead=0x00;
initIterState = myConverterData->fromUnicodeCurrentState;
initIterState = (StateEnumCN) myConverterData->fromUnicodeCurrentState;
if (U_FAILURE (*err)){
break;
@ -3736,7 +3736,7 @@ U_CFUNC void UConverter_fromUnicode_ISO_2022_CN_OFFSETS_LOGIC(UConverterFromUnic
isEscapeAppended =(UBool) myConverterData->isEscapeAppended;
isShiftAppended =(UBool) myConverterData->isShiftAppended;
initIterState = myConverterData->fromUnicodeCurrentState;
initIterState = (StateEnumCN)myConverterData->fromUnicodeCurrentState;
/* arguments check*/
if ((args->converter == NULL) || (args->targetLimit < args->target) || (args->sourceLimit < args->source)){
*err = U_ILLEGAL_ARGUMENT_ERROR;
@ -3873,7 +3873,7 @@ getTrail:
}
if(targetUniChar==missingCharMarker){
iterCount = (iterCount<3)? iterCount+1 : 0;
myConverterData->fromUnicodeCurrentState=currentState=(StateEnum)(currentState<3)? currentState+1:0;
myConverterData->fromUnicodeCurrentState=currentState=(StateEnumCN)(currentState<3)? currentState+1:0;
currentState =(StateEnumCN) myConverterData->fromUnicodeCurrentState;
myConverterData->fromUnicodeConverter = (myConverterData->fromUnicodeConverter == NULL) ?
myConverterData->myConverterArray[0] :
@ -3973,7 +3973,7 @@ CALLBACK:
args->source=saveSource;
args->target=saveTarget;
args->offsets=saveOffsets;
initIterState = myConverterData->fromUnicodeCurrentState;
initIterState = (StateEnumCN)myConverterData->fromUnicodeCurrentState;
myConverterData->isEscapeAppended=isEscapeAppended=FALSE;
args->converter->fromUSurrogateLead=0x00;
@ -4227,7 +4227,7 @@ DONE:
_this->mode = UCNV_SI;
myData2022->currentConverter = myUConverter =
(tempState!=INVALID_STATE)? myData2022->myConverterArray[tempState]:NULL;
myData2022->toUnicodeCurrentState = tempState;
myData2022->toUnicodeCurrentState =(StateEnum) tempState;
*err= (tempState==INVALID_STATE)?U_ILLEGAL_ESCAPE_SEQUENCE :U_ZERO_ERROR;
}
break;
@ -4542,7 +4542,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC(UConverterToUnicodeA
if(args->converter->toUnicodeStatus != 0x00){
goto SAVE_STATE;
}
myData->currentType = ASCII;
myData->currentType = ASCII1;
myData->plane=plane = 0;
break;
@ -4550,7 +4550,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC(UConverterToUnicodeA
if(args->converter->toUnicodeStatus != 0x00){
goto SAVE_STATE;
}
myData->currentType = ASCII;
myData->currentType = ASCII1;
myData->plane=plane = 0;
break;
@ -4558,7 +4558,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC(UConverterToUnicodeA
if(args->converter->toUnicodeStatus != 0x00){
goto SAVE_STATE;
}
myData->currentType = ASCII;
myData->currentType = ASCII1;
myData->plane=plane = 0;
continue;
@ -4593,7 +4593,7 @@ U_CFUNC void UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC(UConverterToUnicodeA
uprv_stricmp("latin_1",
myData->currentConverter->sharedData->staticData->name)==0){
myData->currentType=ASCII;
myData->currentType=ASCII1;
}
if(U_FAILURE(*err)){
return;

8
icu4c/source/common/ucnv_bld.c
View file

@ -375,7 +375,7 @@ UConverter *
UConverter *myUConverter = NULL;
UConverterSharedData *mySharedConverterData = NULL;
UErrorCode internalErrorCode = U_ZERO_ERROR;
uint32_t version=0;
uint32_t options=0;
if (U_FAILURE (*err))
return NULL;
@ -391,7 +391,7 @@ UConverter *
/* the default converter name is already canonical */
} else {
/* separate the converter name from the options */
parseConverterOptions(converterName, cnvName, locale,&version);
parseConverterOptions(converterName, cnvName, locale,&options);
/* get the canonical converter name */
realName = ucnv_io_getConverterName(cnvName, &internalErrorCode);
@ -406,7 +406,7 @@ UConverter *
/* separate the converter name from the options */
if(realName != cnvName) {
parseConverterOptions(realName, cnvName, locale,&version);
parseConverterOptions(realName, cnvName, locale,&options);
realName = cnvName;
}
@ -464,7 +464,7 @@ UConverter *
uprv_memcpy (myUConverter->subChar, myUConverter->sharedData->staticData->subChar, myUConverter->subCharLen);
if(myUConverter != NULL && myUConverter->sharedData->impl->open != NULL) {
myUConverter->sharedData->impl->open(myUConverter, realName, locale,&version, err);
myUConverter->sharedData->impl->open(myUConverter, realName, locale,options, err);
if(U_FAILURE(*err)) {
ucnv_close(myUConverter);
return NULL;

2
icu4c/source/common/ucnv_cnv.h
View file

@ -137,7 +137,7 @@ U_CDECL_BEGIN
typedef void (*UConverterLoad) (UConverterSharedData *sharedData, const uint8_t *raw, UErrorCode *pErrorCode);
typedef void (*UConverterUnload) (UConverterSharedData *sharedData);
typedef void (*UConverterOpen) (UConverter *cnv, const char *name, const char *locale,uint32_t* options, UErrorCode *pErrorCode);
typedef void (*UConverterOpen) (UConverter *cnv, const char *name, const char *locale,uint32_t options, UErrorCode *pErrorCode);
typedef void (*UConverterClose) (UConverter *cnv);
typedef void (*UConverterReset) (UConverter *cnv);

4
icu4c/source/common/ucnv_lmb.c
View file

@ -532,7 +532,7 @@ optimization group. So, we put the common stuff into a worker function,
and set up another macro to stamp out the 12 open functions:*/
#define DEFINE_LMBCS_OPEN(n) \
static void \
_LMBCSOpen##n(UConverter* _this,const char* name,const char* locale,uint32_t* options,UErrorCode* err) \
_LMBCSOpen##n(UConverter* _this,const char* name,const char* locale,uint32_t options,UErrorCode* err) \
{ _LMBCSOpenWorker(_this, name,locale,options, err, n);}
@ -559,7 +559,7 @@ static void
_LMBCSOpenWorker(UConverter* _this,
const char* name,
const char* locale,
uint32_t* options,
uint32_t options,
UErrorCode* err,
ulmbcs_byte_t OptGroup
)

8
icu4c/source/common/ucnvhz.c
View file

@ -44,7 +44,7 @@
}
/*********** HZ Converter Protos ***********/
static void _HZOpen(UConverter *cnv, const char *name, const char *locale, uint32_t *options,UErrorCode *errorCode);
static void _HZOpen(UConverter *cnv, const char *name, const char *locale, uint32_t options,UErrorCode *errorCode);
static void _HZClose(UConverter *converter);
static void _HZReset(UConverter *converter);
@ -109,7 +109,7 @@ typedef struct{
static void _HZOpen(UConverter *cnv, const char *name,const char *locale,uint32_t *options, UErrorCode *errorCode){
static void _HZOpen(UConverter *cnv, const char *name,const char *locale,uint32_t options, UErrorCode *errorCode){
cnv->toUnicodeStatus = 0;
cnv->fromUnicodeStatus= 0;
cnv->mode=0;
@ -651,7 +651,7 @@ U_CFUNC void UConverter_fromUnicode_HZ(UConverterFromUnicodeArgs *args, UErrorCo
int32_t targetLength = args->targetLimit - args->target;
int32_t sourceLength = args->sourceLimit - args->source;
int32_t length=0;
UChar32 targetUniChar = 0x0000;
uint32_t targetUniChar = 0x0000;
UChar32 mySourceChar = 0x0000,c=0x0000;
UConverterDataHZ *myConverterData=(UConverterDataHZ*)args->converter->extraInfo;
UBool isTargetUCharDBCS = (UBool) myConverterData->isTargetUCharDBCS;
@ -829,7 +829,7 @@ U_CFUNC void UConverter_fromUnicode_HZ_OFFSETS_LOGIC (UConverterFromUnicodeArgs
int32_t targetLength = args->targetLimit - args->target;
int32_t sourceLength = args->sourceLimit - args->source;
int32_t length=0;
UChar32 targetUniChar = 0x0000;
uint32_t targetUniChar = 0x0000;
UChar32 mySourceChar = 0x0000,c=0x0000;
UConverterDataHZ *myConverterData=(UConverterDataHZ*)args->converter->extraInfo;
UBool isTargetUCharDBCS = (UBool) myConverterData->isTargetUCharDBCS;

2
icu4c/source/common/ucnvmbcs.c
View file

@ -265,7 +265,7 @@ U_CFUNC void
_MBCSOpen(UConverter *cnv,
const char *name,
const char *locale,
uint32_t *options,
uint32_t options,
UErrorCode *pErrorCode) {
_MBCSReset(cnv);
if(uprv_strstr(name, "gb18030")!=NULL || uprv_strstr(name, "GB18030")!=NULL) {