From 2dc9cb9c98e4c7622a29445847cbb2a3db5d05f6 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 1 Sep 2004 01:17:47 +0000 Subject: [PATCH] ICU-3841 change in ures_open behavior & client fix X-SVN-Rev: 16238 --- icu4c/source/common/uresbund.c | 4 +--- icu4c/source/common/uscript.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/icu4c/source/common/uresbund.c b/icu4c/source/common/uresbund.c index e00f93ef43..5fea990c5e 100644 --- a/icu4c/source/common/uresbund.c +++ b/icu4c/source/common/uresbund.c @@ -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; diff --git a/icu4c/source/common/uscript.c b/icu4c/source/common/uscript.c index c7f2957f87..61ea2cd223 100644 --- a/icu4c/source/common/uscript.c +++ b/icu4c/source/common/uscript.c @@ -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) ){