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

ICU-3778 Use a codepage specific char * instead of UTF-8 for the version string.

Browse source 
X-SVN-Rev: 22319
This commit is contained in:
George Rhoten 2007-08-08 18:38:20 +00:00
parent 979a520c59
commit 096748976d
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
icu4c/source/i18n/timezone.cpp
View file

@ -120,6 +120,8 @@ static UBool U_CALLCONV timeZone_cleanup(void)
delete _GMT;
_GMT = NULL;
uprv_memset(TZDATA_VERSION, 0, sizeof(TZDATA_VERSION));
if (LOCK) {
umtx_destroy(&LOCK);
LOCK = NULL;
@ -1277,16 +1279,19 @@ TimeZone::getTZDataVersion(UErrorCode& status)
UBool needsInit;
UMTX_CHECK(&LOCK, (TZDATA_VERSION[0] == 0), needsInit);
if (needsInit) {
umtx_lock(&LOCK);
int32_t len = sizeof(TZDATA_VERSION);
UResourceBundle *bundle = ures_openDirect(NULL, "zoneinfo", &status);
const char *tzver = ures_getUTF8StringByKey(bundle, "TZVersion",
TZDATA_VERSION, &len, FALSE, &status);
if (U_FAILURE(status)) {
TZDATA_VERSION[0] = 0;
const UChar *tzver = ures_getStringByKey(bundle, "TZVersion",
&len, &status);
umtx_lock(&LOCK);
if (U_SUCCESS(status)) {
u_UCharsToChars(tzver, TZDATA_VERSION, len+1);
ucln_i18n_registerCleanup(UCLN_I18N_TIMEZONE, timeZone_cleanup);
}
ures_close(bundle);
umtx_unlock(&LOCK);
ures_close(bundle);
}
if (U_FAILURE(status)) {
return NULL;