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

ICU-157 improve UErrorCode handling

Browse Source 
X-SVN-Rev: 218
This commit is contained in:
Markus Scherer 1999-11-22 19:53:19 +00:00
parent f8abd4f79a
commit e46d3d649c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,7 +731,6 @@ doOpenChoice(const char *path, const char *type, const char *name,
lib=NO_LIBRARY;
}
} else {
*pErrorCode=errorCode;
if(!isICUData) {
UNLOAD_LIBRARY(lib);
}
@ -761,7 +760,6 @@ doOpenChoice(const char *path, const char *type, const char *name,
/* look for the entry point */
p=getChoice(lib, entryName, type, name, isAcceptable, context, &errorCode);
if(p==NULL) {
*pErrorCode=errorCode;
UNLOAD_LIBRARY(lib);
}
}
@ -789,7 +787,6 @@ doOpenChoice(const char *path, const char *type, const char *name,
/* look for the entry point */
p=getChoice(lib, entryName, type, name, isAcceptable, context, &errorCode);
if(p==NULL) {
*pErrorCode=errorCode;
UNLOAD_LIBRARY(lib);
}
}
@ -836,7 +833,13 @@ doOpenChoice(const char *path, const char *type, const char *name,
/* data not found */
if(U_SUCCESS(*pErrorCode)) {
*pErrorCode=U_FILE_ACCESS_ERROR;
if(U_SUCCESS(errorCode)) {
/* file not found */
*pErrorCode=U_FILE_ACCESS_ERROR;
} else {
/* entry point not found or rejected */
*pErrorCode=errorCode;
}
}
return NULL;
}