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-20769 getAliasTargetAsResourceBundle() only needs ResourceData

Browse source
This commit is contained in:
Markus Scherer 2021-09-01 09:35:43 -07:00
parent cb351ee077
commit e121dde220
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
icu4c/source/common/uresbund.cpp
View file

@ -986,7 +986,7 @@ UResourceBundle *init_resb_result(
// rather than a UResourceBundle.
// May need to entryIncrease() the resulting dataEntry.
UResourceBundle *getAliasTargetAsResourceBundle(
UResourceDataEntry *dataEntry, Resource r, const char *key, int32_t idx,
const ResourceData &resData, Resource r, const char *key, int32_t idx,
UResourceDataEntry *validLocaleDataEntry, const char *containerResPath,
int32_t recursionDepth,
UResourceBundle *resB, UErrorCode *status) {
@ -994,7 +994,7 @@ UResourceBundle *getAliasTargetAsResourceBundle(
if (U_FAILURE(*status)) { return resB; }
U_ASSERT(RES_GET_TYPE(r) == URES_ALIAS);
int32_t len = 0;
const UChar *alias = res_getAlias(&dataEntry->fData, r, &len);
const UChar *alias = res_getAlias(&resData, r, &len);
if(len <= 0) {
// bad alias
*status = U_ILLEGAL_ARGUMENT_ERROR;
@ -1063,12 +1063,13 @@ UResourceBundle *getAliasTargetAsResourceBundle(
*sep++ = 0;
}
keyPath = sep;
path = dataEntry->fPath;
path = validLocaleDataEntry->fPath;
}
// Got almost everything, let's try to open.
// First, open the bundle with real data.
LocalUResourceBundlePointer mainRes;
UResourceDataEntry *dataEntry;
if (locale == nullptr) {
// alias = /LOCALE/keyPath
// Read from the valid locale which we already have.
@ -1227,7 +1228,7 @@ UResourceBundle *init_resb_result(
return resB;
}
return getAliasTargetAsResourceBundle(
dataEntry, r, key, idx,
dataEntry->fData, r, key, idx,
validLocaleDataEntry, containerResPath, recursionDepth, resB, status);
}
if(resB == NULL) {