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

ICU-3549 work around hp11 acc bug

Browse Source 
X-SVN-Rev: 15113
This commit is contained in:
Alan Liu 2004-04-30 22:04:46 +00:00
parent 0c6f5d4ada
commit dac1d7dd63
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
icu4c/source/i18n/ucol.cpp
View File

@ -7548,13 +7548,11 @@ ucol_openAvailableLocales(UErrorCode *status) {
return uenum_openStringEnumeration(s, status); return uenum_openStringEnumeration(s, status);
} }
// would be nice if KW == RESOURCE_NAME - alan // Note: KEYWORDS[0] != RESOURCE_NAME - alan
static const char* KW = "collation";
static const char* RESOURCE_NAME = "collations"; static const char* RESOURCE_NAME = "collations";
static const char* KEYWORDS[] = { KW }; static const char* KEYWORDS[] = { "collation" };
#define KEYWORD_COUNT (sizeof(KEYWORDS)/sizeof(KEYWORDS[0])) #define KEYWORD_COUNT (sizeof(KEYWORDS)/sizeof(KEYWORDS[0]))
@ -7572,7 +7570,7 @@ ucol_getKeywordValues(const char *keyword, UErrorCode *status) {
// hard-coded to accept exactly one collation keyword // hard-coded to accept exactly one collation keyword
// modify if additional collation keyword is added later // modify if additional collation keyword is added later
if (U_SUCCESS(*status) && if (U_SUCCESS(*status) &&
keyword==NULL || uprv_strcmp(keyword, KW)!=0) { keyword==NULL || uprv_strcmp(keyword, KEYWORDS[0])!=0) {
*status = U_ILLEGAL_ARGUMENT_ERROR; *status = U_ILLEGAL_ARGUMENT_ERROR;
return NULL; return NULL;
} }
@ -7586,7 +7584,7 @@ ucol_getFunctionalEquivalent(char* result, int32_t resultCapacity,
// odd that resource name is "collations" but keyword is // odd that resource name is "collations" but keyword is
// "collation" // "collation"
return ures_getFunctionalEquivalent(result, resultCapacity, U_ICUDATA_COLL, return ures_getFunctionalEquivalent(result, resultCapacity, U_ICUDATA_COLL,
"collations", KW, locale, "collations", KEYWORDS[0], locale,
isAvailable, status); isAvailable, status);
} }