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

ICU-3841 change in ures_open behavior & client fix

Browse Source 
X-SVN-Rev: 16238
This commit is contained in:
Steven R. Loomis 2004-09-01 01:17:47 +00:00
parent 9acfb00960
commit 2dc9cb9c98
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,9 +277,7 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE
}
if(path != NULL) { /* if we actually have path, we'll use it */
if(uprv_strcmp(path, u_getDataDirectory()) != 0) { /* unless it is system default path */
myPath = path;
}
myPath = path;
}
find.fName = name;

2
icu4c/source/common/uscript.c
View File

@ -47,7 +47,7 @@ uscript_getCode(const char* nameOrAbbrOrLocale,
if(code==(UScriptCode)UCHAR_INVALID_CODE){
/* Do not propagate error codes from just not finding a locale bundle. */
UErrorCode localErrorCode = U_ZERO_ERROR;
UResourceBundle* resB = ures_open(u_getDataDirectory(),nameOrAbbrOrLocale,&localErrorCode);
UResourceBundle* resB = ures_open(NULL,nameOrAbbrOrLocale,&localErrorCode);
if(U_SUCCESS(localErrorCode)&& localErrorCode != U_USING_DEFAULT_WARNING){
UResourceBundle* resD = ures_getByKey(resB,kLocaleScript,NULL,&localErrorCode);
if(U_SUCCESS(localErrorCode) ){