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

ICU-729 Fixed multithreading bug. Changed implementation

Browse source 
ucnv_getName() function to return converter name with options.
Renamed UConverterOpen Function parameter from version to
options.

X-SVN-Rev: 2995
This commit is contained in:
Ram Viswanadha 2000-11-22 02:05:29 +00:00
parent f2cc4f35e2
commit 3e0584e78d
6 changed files with 178 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/common/ucnv.c
View file

@ -513,7 +513,11 @@ const char* ucnv_getName (const UConverter * converter, UErrorCode * err)
{
if (U_FAILURE (*err))
return NULL;
if(converter->sharedData->impl->getName){
const char* temp= converter->sharedData->impl->getName(converter);
if(temp)
return temp;
}
return converter->sharedData->staticData->name;
}

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

@ -89,6 +89,7 @@ typedef enum {
}Cnv2022Type;
#define UCNV_OPTIONS_VERSION_MASK 0xf
typedef struct{
UConverter *currentConverter;
@ -107,6 +108,8 @@ typedef struct{
UBool isLocaleSpecified;
uint32_t key;
uint32_t version;
char locale[3];
char name[30];
}UConverterDataISO2022;
/* ISO-2022 ----------------------------------------------------------------- */
@ -339,7 +342,8 @@ UCNV_TableStates_2022 getKey_2022(char source,
/*********** ISO 2022 Converter Protos ***********/
static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t* version, UErrorCode *errorCode);
static void _ISO2022Close(UConverter *converter);
static void _ISO2022Reset(UConverter *converter);
static void _ISO2022Reset(UConverter *converter);
static const char* _ISO2022getName(UConverter* cnv);
/************ protos of functions for setting the initial state *********************/
static void setInitialStateToUnicodeJPCN(UConverter* converter,UConverterDataISO2022 *myConverterData);
@ -348,7 +352,7 @@ static void setInitialStateToUnicodeKR(UConverter* converter,UConverterDataISO20
static void setInitialStateFromUnicodeKR(UConverter* converter,UConverterDataISO2022 *myConverterData);
/*************** Converter implemenations ******************/
static UConverterImpl _ISO2022Impl={
static const UConverterImpl _ISO2022Impl={
UCNV_ISO_2022,
NULL,
@ -364,25 +368,135 @@ static UConverterImpl _ISO2022Impl={
T_UConverter_fromUnicode_ISO_2022_OFFSETS_LOGIC,
T_UConverter_getNextUChar_ISO_2022,
NULL
NULL,
_ISO2022getName
};
const UConverterStaticData _ISO2022StaticData={
sizeof(UConverterStaticData),
"ISO_2022",
2022, UCNV_IBM, UCNV_ISO_2022, 1, 4,
{ 0x1a, 0, 0, 0 },1, FALSE, FALSE,
"ISO_2022",
2022,
UCNV_IBM,
UCNV_ISO_2022,
1,
4,
{ 0x1a, 0, 0, 0 },
1,
FALSE,
FALSE,
{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} /* reserved */
};
const UConverterSharedData _ISO2022Data={
sizeof(UConverterSharedData), ~((uint32_t) 0),
NULL, NULL, &_ISO2022StaticData, FALSE, &_ISO2022Impl,
0
sizeof(UConverterSharedData),
~((uint32_t) 0),
NULL,
NULL,
&_ISO2022StaticData,
FALSE,
&_ISO2022Impl,
0
};
static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t* version, UErrorCode *errorCode){
/*************JP****************/
static const UConverterImpl _ISO2022JPImpl={
UCNV_ISO_2022,
NULL,
NULL,
_ISO2022Open,
_ISO2022Close,
_ISO2022Reset,
UConverter_toUnicode_ISO_2022_JP,
UConverter_toUnicode_ISO_2022_JP_OFFSETS_LOGIC,
UConverter_fromUnicode_ISO_2022_JP,
UConverter_fromUnicode_ISO_2022_JP_OFFSETS_LOGIC,
UConverter_getNextUChar_ISO_2022_JP,
NULL,
_ISO2022getName
};
const UConverterSharedData _ISO2022JPData={
sizeof(UConverterSharedData),
~((uint32_t) 0),
NULL,
NULL,
&_ISO2022StaticData,
FALSE,
&_ISO2022JPImpl,
0
};
/************* KR ***************/
static const UConverterImpl _ISO2022KRImpl={
UCNV_ISO_2022,
NULL,
NULL,
_ISO2022Open,
_ISO2022Close,
_ISO2022Reset,
UConverter_toUnicode_ISO_2022_KR,
UConverter_toUnicode_ISO_2022_KR_OFFSETS_LOGIC,
UConverter_fromUnicode_ISO_2022_KR,
UConverter_fromUnicode_ISO_2022_KR_OFFSETS_LOGIC,
UConverter_getNextUChar_ISO_2022_KR,
NULL,
_ISO2022getName
};
const UConverterSharedData _ISO2022KRData={
sizeof(UConverterSharedData),
~((uint32_t) 0),
NULL,
NULL,
&_ISO2022StaticData,
FALSE,
&_ISO2022KRImpl,
0
};
/*************** CN ***************/
static const UConverterImpl _ISO2022CNImpl={
UCNV_ISO_2022,
NULL,
NULL,
_ISO2022Open,
_ISO2022Close,
_ISO2022Reset,
UConverter_toUnicode_ISO_2022_CN,
UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC,
UConverter_fromUnicode_ISO_2022_CN,
UConverter_fromUnicode_ISO_2022_CN_OFFSETS_LOGIC,
UConverter_getNextUChar_ISO_2022_CN,
NULL,
_ISO2022getName
};
const UConverterSharedData _ISO2022CNData={
sizeof(UConverterSharedData),
~((uint32_t) 0),
NULL,
NULL,
&_ISO2022StaticData,
FALSE,
&_ISO2022CNImpl,
0
};
/**********/
static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,uint32_t* options, UErrorCode *errorCode){
char myLocale[6]={' ',' ',' ',' ',' ',' '};
@ -422,22 +536,21 @@ static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,u
ucnv_setSubstChars(cnv,"\x1b\x28\x42\x1A", 4, errorCode);
/* set the function pointers to appropriate funtions */
_ISO2022Impl.toUnicode = UConverter_toUnicode_ISO_2022_JP;
_ISO2022Impl.toUnicodeWithOffsets = UConverter_toUnicode_ISO_2022_JP_OFFSETS_LOGIC;
_ISO2022Impl.fromUnicode = UConverter_fromUnicode_ISO_2022_JP;
_ISO2022Impl.fromUnicodeWithOffsets = UConverter_fromUnicode_ISO_2022_JP_OFFSETS_LOGIC;
_ISO2022Impl.getNextUChar = UConverter_getNextUChar_ISO_2022_JP;
if(version){
switch (*version){
case '0':
cnv->sharedData=(UConverterSharedData*)(&_ISO2022JPData);
uprv_strcpy(myConverterData->locale,"ja");
uprv_strcpy(myConverterData->name,"ISO_2022,locale=ja");
if(options){
switch (*options & UCNV_OPTIONS_VERSION_MASK){
case 0:
myConverterData->version = 0;
break;
case '1':
case 1:
myConverterData->version = 1;
uprv_strcpy(myConverterData->name,"ISO_2022,locale=ja,version=1");
break;
case '2':
case 2:
myConverterData->version = 2;
uprv_strcpy(myConverterData->name,"ISO_2022,locale=ja,version=2");
break;
default:
myConverterData->version = 0;
@ -457,11 +570,11 @@ static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,u
ucnv_setSubstChars(cnv,"\x0F\x1A", 2, errorCode);
/* set the function pointers to appropriate funtions */
_ISO2022Impl.toUnicode = UConverter_toUnicode_ISO_2022_KR;
_ISO2022Impl.toUnicodeWithOffsets = UConverter_toUnicode_ISO_2022_KR_OFFSETS_LOGIC;
_ISO2022Impl.fromUnicode = UConverter_fromUnicode_ISO_2022_KR;
_ISO2022Impl.fromUnicodeWithOffsets = UConverter_fromUnicode_ISO_2022_KR_OFFSETS_LOGIC;
_ISO2022Impl.getNextUChar = UConverter_getNextUChar_ISO_2022_KR;
cnv->sharedData=(UConverterSharedData*)&_ISO2022KRData;
uprv_strcpy(myConverterData->locale,"kr");
uprv_strcpy(myConverterData->name,"ISO_2022,locale=kr");
myConverterData->version=0;
}
else if((myLocale[0]=='z'|| myLocale[0]=='c') && (myLocale[1]=='h'|| myLocale[1]=='n') &&
@ -479,25 +592,27 @@ static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,u
setInitialStateFromUnicodeJPCN(myConverterData);
ucnv_setSubstChars(cnv,"\x0F\x1A", 2, errorCode);
/* set the function pointers to appropriate funtions */
_ISO2022Impl.toUnicode = UConverter_toUnicode_ISO_2022_CN;
_ISO2022Impl.toUnicodeWithOffsets = UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC;
_ISO2022Impl.fromUnicode = UConverter_fromUnicode_ISO_2022_CN;
_ISO2022Impl.fromUnicodeWithOffsets = UConverter_fromUnicode_ISO_2022_CN_OFFSETS_LOGIC;
_ISO2022Impl.getNextUChar = UConverter_getNextUChar_ISO_2022_CN;
if(version){
switch (*version){
case '0':
cnv->sharedData=(UConverterSharedData*)&_ISO2022CNData;
uprv_strcpy(myConverterData->locale,"cn");
uprv_strcpy(myConverterData->name,"ISO_2022,locale=cn");
if(options){
switch (*options & UCNV_OPTIONS_VERSION_MASK){
case 0:
myConverterData->version = 0;
break;
case '1':
case 1:
myConverterData->version = 1;
uprv_strcpy(myConverterData->name,"ISO_2022,locale=cn,version=1");
break;
default:
myConverterData->version = 0;
}
}
}
else{
/* append the UTF-8 escape sequence */
@ -505,9 +620,11 @@ static void _ISO2022Open(UConverter *cnv, const char *name, const char *locale,u
cnv->charErrorBuffer[0] = 0x1b;
cnv->charErrorBuffer[1] = 0x25;
cnv->charErrorBuffer[2] = 0x42;
cnv->sharedData=(UConverterSharedData*)&_ISO2022Data;
/* initialize the state variables */
myConverterData->isLocaleSpecified=FALSE;
uprv_strcpy(myConverterData->name,"ISO_2022");
}
} else {
@ -563,6 +680,13 @@ _ISO2022Reset(UConverter *converter) {
}
}
static const char* _ISO2022getName(UConverter* cnv){
if(cnv->extraInfo){
UConverterDataISO2022* myData= (UConverterDataISO2022*)cnv->extraInfo;
return myData->name;
}
return NULL;
}
static void setInitialStateToUnicodeJPCN(UConverter* converter,UConverterDataISO2022 *myConverterData ){
myConverterData->toUnicodeCurrentState =ASCII;

8
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* version, 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);
@ -151,6 +151,11 @@ typedef UChar32 (*T_GetNextUCharFunction) (UConverterToUnicodeArgs *, UErrorCode
typedef void (*UConverterGetStarters)(const UConverter* converter,
UBool starters[256],
UErrorCode *pErrorCode);
/* If this function pointer is null or if the function returns null
* the name field in static data struct should be returned by
* ucnv_getName() API function
*/
typedef const char * (*UConverterGetName) (UConverter *cnv);
UBool CONVERSION_U_SUCCESS (UErrorCode err);
@ -201,6 +206,7 @@ struct UConverterImpl {
T_GetNextUCharFunction getNextUChar;
UConverterGetStarters getStarters;
UConverterGetName getName;
};
extern const UConverterSharedData

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

@ -532,8 +532,8 @@ 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* version,UErrorCode* err) \
{ _LMBCSOpenWorker(_this, name,locale,version, err, n);}
_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* version,
uint32_t* options,
UErrorCode* err,
ulmbcs_byte_t OptGroup
)

4
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 *version,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);
@ -108,7 +108,7 @@ typedef struct{
static void _HZOpen(UConverter *cnv, const char *name,const char *locale,uint32_t *version, 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;

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

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