AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5226 Fix a problem from the last check that will cause default algorithmic converters with options to be created incorrectly.

Browse Source 
X-SVN-Rev: 19714
This commit is contained in:
George Rhoten 2006-06-13 15:50:01 +00:00
parent 2187439b4d
commit a706c5b441
2 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
icu4c/source/common/ucnv_bld.c
View File

@ -1076,14 +1076,22 @@ ucnv_bld_getAvailableConverter(uint16_t n, UErrorCode *pErrorCode) {
/* Copy the canonical converter name. Caller must ensure thread safety. */
static U_INLINE void
internalSetName(const char *name) {
internalSetName(const char *name, UErrorCode *status) {
UConverterLookupData lookup;
int32_t length=(int32_t)(uprv_strlen(name));
uprv_memcpy(gDefaultConverterNameBuffer, name, length);
gDefaultConverterNameBuffer[length]=0;
gDefaultConverterName = gDefaultConverterNameBuffer;
gDefaultConverterContainsOption = (UBool)(uprv_strchr(gDefaultConverterName, UCNV_OPTION_SEP_CHAR) != NULL);
gDefaultAlgorithmicSharedData = getAlgorithmicTypeFromName(name);
lookup.locale[0] = 0;
lookup.options = 0;
lookup.realName = name;
if(gDefaultConverterContainsOption) {
parseConverterOptions(lookup.realName, lookup.cnvName, lookup.locale, &lookup.options, status);
lookup.realName = lookup.cnvName;
}
gDefaultAlgorithmicSharedData = getAlgorithmicTypeFromName(lookup.realName);
ucln_common_registerCleanup(UCLN_COMMON_UCNV, ucnv_cleanup);
}
@ -1132,7 +1140,7 @@ ucnv_getDefaultName() {
}
umtx_lock(&cnvCacheMutex);
internalSetName(name);
internalSetName(name, &errorCode);
umtx_unlock(&cnvCacheMutex);
/* The close may make the current name go away. */
@ -1163,7 +1171,7 @@ ucnv_setDefaultName(const char *converterName) {
if(U_SUCCESS(errorCode) && name!=NULL) {
umtx_lock(&cnvCacheMutex);
internalSetName(name);
internalSetName(name, &errorCode);
umtx_unlock(&cnvCacheMutex);
}

61
icu4c/source/test/cintltst/ccapitst.c
View File

@ -107,6 +107,7 @@ static void TestConvertAlgorithmic(void);
void TestDefaultConverterError(void); /* defined in cctest.c */
static void TestToUCountPending(void);
static void TestFromUCountPending(void);
static void TestDefaultName(void);
void addTestConvert(TestNode** root);
void addTestConvert(TestNode** root)
@ -128,6 +129,7 @@ void addTestConvert(TestNode** root)
addTest(root, &TestDefaultConverterError, "tsconv/ccapitst/TestDefaultConverterError");
addTest(root, &TestToUCountPending, "tsconv/ccapitst/TestToUCountPending");
addTest(root, &TestFromUCountPending, "tsconv/ccapitst/TestFromUCountPending");
addTest(root, &TestDefaultName, "tsconv/ccapitst/TestDefaultName");
}
static void ListNames(void) {
@ -511,28 +513,6 @@ static void TestConvert()
log_verbose("getName(someConverters[1]) returned %s\n", ucnv_getName(someConverters[1], &err));
}
/*Testing ucnv_getDefaultName() and ucnv_setDefaultNAme()*/
{
static char defaultName[UCNV_MAX_CONVERTER_NAME_LENGTH + 1];
strcpy(defaultName, ucnv_getDefaultName());
log_verbose("getDefaultName returned %s\n", defaultName);
/*change the default name by setting it */
ucnv_setDefaultName("UTF-8");
if(strcmp(ucnv_getDefaultName(), "UTF-8")==0)
log_verbose("setDefaultName o.k");
else
log_err("setDefaultName failed\n");
ucnv_setDefaultName("ISO-8859-1");
if(strcmp(ucnv_getDefaultName(), "ISO-8859-1")==0)
log_verbose("setDefaultName o.k");
else
log_err("setDefaultName failed\n");
/*set the default name back*/
ucnv_setDefaultName(defaultName);
}
ucnv_close(someConverters[0]);
ucnv_close(someConverters[1]);
ucnv_close(someConverters[2]);
@ -3010,3 +2990,40 @@ TestToUCountPending(){
}
}
static void TestOneDefaultNameChange(const char *name) {
UErrorCode status = U_ZERO_ERROR;
UConverter *cnv;
ucnv_setDefaultName(name);
if(strcmp(ucnv_getDefaultName(), name)==0)
log_verbose("setDefaultName of %s works.\n", name);
else
log_err("setDefaultName of %s failed\n", name);
cnv=ucnv_open(NULL, &status);
if (U_FAILURE(status) || cnv == NULL) {
log_err("opening the default converter of %s failed\n", name);
}
if(strcmp(ucnv_getName(cnv, &status), name)==0)
log_verbose("ucnv_getName of %s works.\n", name);
else
log_err("ucnv_getName of %s failed\n", name);
ucnv_close(cnv);
}
static void TestDefaultName(void) {
/*Testing ucnv_getDefaultName() and ucnv_setDefaultNAme()*/
static char defaultName[UCNV_MAX_CONVERTER_NAME_LENGTH + 1];
strcpy(defaultName, ucnv_getDefaultName());
log_verbose("getDefaultName returned %s\n", defaultName);
/*change the default name by setting it */
TestOneDefaultNameChange("UTF-8");
TestOneDefaultNameChange("ISCII,version=1");
TestOneDefaultNameChange("ISCII,version=2");
TestOneDefaultNameChange("ISO-8859-1");
/*set the default name back*/
ucnv_setDefaultName(defaultName);
}