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

ICU-157 fixed opening single, mapped files

Browse Source 
X-SVN-Rev: 338
This commit is contained in:
Richard Gillam 1999-12-08 01:11:01 +00:00
parent 5927a9f1e8
commit 1e7ac47da4
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,9 @@ LOAD_LIBRARY(const char *path, const char *basename, bool_t isCommon) {
pData->p=p;
/* is it acceptable? */
if(NULL==getChoice(pData, NULL, DATA_TYPE, COMMON_DATA_NAME, isCommonDataAcceptable, NULL, &errorCode)) {
if(NULL==getChoice(pData, NULL, DATA_TYPE, COMMON_DATA_NAME,
isCommon ? isCommonDataAcceptable : NULL, NULL, &errorCode)
) {
udata_close(pData);
return NULL;
}
@ -351,7 +353,9 @@ LOAD_LIBRARY(const char *path, const char *basename, bool_t isCommon) {
pData->p =(MappedData *)data;
/* is it acceptable? */
if(NULL==getChoice(pData, NULL, DATA_TYPE, COMMON_DATA_NAME, isCommonDataAcceptable, NULL, &errorCode)) {
if(NULL==getChoice(pData, NULL, DATA_TYPE, COMMON_DATA_NAME,
isCommon ? isCommonDataAcceptable : NULL, NULL, &errorCode)
) {
udata_close(pData);
return NULL;
}
@ -823,7 +827,12 @@ doOpenChoice(const char *path, const char *type, const char *name,
if(IS_LIBRARY(lib)) {
/* look for the entry point */
p=getChoice(lib, entryName, type, name, isAcceptable, context, &errorCode);
# ifdef UDATA_MAP
/* entryName passed as NULL: prevent TOC lookup for single, mapped files */
p=getChoice(lib, NULL, type, name, isAcceptable, context, &errorCode);
# else
p=getChoice(lib, entryName, type, name, isAcceptable, context, &errorCode);
# endif
if(p==NULL) {
UNLOAD_LIBRARY(lib);
}
@ -850,7 +859,12 @@ doOpenChoice(const char *path, const char *type, const char *name,
if(IS_LIBRARY(lib)) {
/* look for the entry point */
p=getChoice(lib, entryName, type, name, isAcceptable, context, &errorCode);
# ifdef UDATA_MAP
/* entryName passed as NULL: prevent TOC lookup for single, mapped files */
p=getChoice(lib, NULL, type, name, isAcceptable, context, &errorCode);
# else
p=getChoice(lib, entryName, type, name, isAcceptable, context, &errorCode);
# endif
if(p==NULL) {
UNLOAD_LIBRARY(lib);
}