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

ICU-3322 fix udata_cacheDataItem to behave correctly with a warning as input (private status). Also fix a stale debug printf. Affects udata_setAppData(), now works correctly with a USING_DEFAULT_WARNING input status

Browse Source 
X-SVN-Rev: 14365
This commit is contained in:
Steven R. Loomis 2004-01-20 21:36:37 +00:00
parent 538fd7836b
commit 76053cb3c6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
icu4c/source/common/udata.c
View File

@ -252,6 +252,7 @@ static UDataMemory *udata_cacheDataItem(const char *path, UDataMemory *item, UEr
int32_t nameLen;
UHashtable *htable;
UDataMemory *oldValue = NULL;
UErrorCode subErr = U_ZERO_ERROR;
if (U_FAILURE(*pErr)) {
return NULL;
@ -286,22 +287,23 @@ static UDataMemory *udata_cacheDataItem(const char *path, UDataMemory *item, UEr
umtx_lock(NULL);
oldValue = uhash_get(htable, path);
if (oldValue != NULL) {
*pErr = U_USING_DEFAULT_WARNING; }
subErr = U_USING_DEFAULT_WARNING; }
else {
uhash_put(
htable,
newElement->name, /* Key */
newElement, /* Value */
pErr);
&subErr);
}
umtx_unlock(NULL);
#ifdef UDATA_DEBUG
fprintf(stderr, "Cache: [%s] <<< %p : %s\n", newElement->name,
newElement->item, u_errorName(*pErr));
fprintf(stderr, "Cache: [%s] <<< %p : %s. vFunc=%p\n", newElement->name,
newElement->item, u_errorName(subErr), newElement->item->vFuncs);
#endif
if (*pErr == U_USING_DEFAULT_WARNING || U_FAILURE(*pErr)) {
if (subErr == U_USING_DEFAULT_WARNING || U_FAILURE(subErr)) {
*pErr = subErr; /* copy sub err unto fillin ONLY if something happens. */
uprv_free(newElement->name);
uprv_free(newElement->item);
uprv_free(newElement);
@ -1027,7 +1029,7 @@ doOpenChoice(const char *path, const char *type, const char *name,
tocEntrySuffix = tocEntryName.s+tocEntrySuffixIndex; /* suffix starts here */
#ifdef UDATA_DEBUG
fprintf(stderr, " tocEntryName = %s\n", tocEntryName->s);
fprintf(stderr, " tocEntryName = %s\n", tocEntryName.s);
#endif