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

ICU-1948 More support for resource level aliases

Browse Source 
X-SVN-Rev: 8894
This commit is contained in:
Vladimir Weinstein 2002-06-14 06:35:09 +00:00
parent 36387b18a7
commit daa0a7488d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,7 +497,9 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, UEr
*/
static void entryClose(UResourceDataEntry *resB);
/* INTERNAL: */
static UResourceBundle *init_resb_result(const ResourceData *rdata, Resource r, const char *key, UResourceDataEntry *realData, UResourceBundle *resB, UErrorCode *status) {
static UResourceBundle *init_resb_result(const ResourceData *rdata, Resource r,
const char *key, UResourceDataEntry *realData,
UResourceBundle *resB, UErrorCode *status) {
if(status == NULL || U_FAILURE(*status)) {
return resB;
}
@ -521,6 +523,9 @@ static UResourceBundle *init_resb_result(const ResourceData *rdata, Resource r,
locale++;
path = chAlias;
}
if(path != NULL && uprv_strlen(path) == 0) {
path = realData->fPath;
}
keyPath = uprv_strchr(locale, '/');
if(keyPath == NULL) {
@ -533,17 +538,18 @@ static UResourceBundle *init_resb_result(const ResourceData *rdata, Resource r,
{
char *kp = NULL;
/* got almost everything, let's try to open */
UResourceBundle *res = ures_open(path, locale, status);
UResourceBundle *main = ures_open(path, locale, status);
UResourceBundle *res = main;
UResourceBundle *res2 = resB;
while(kp=uprv_strchr(keyPath, '/')) {
while((kp=uprv_strchr(keyPath, '/')) && U_SUCCESS(*status)) {
*kp = 0;
res2 = ures_getByKey(res, keyPath, res2, status);
ures_close(res);
/*ures_close(res);*/
res = res2;
keyPath = kp+1;
}
res2 = ures_getByKey(res, keyPath, res2, status);
ures_close(res);
ures_close(main);
/*res = res2;*/
/* here we have the wanted resource */