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

ICU-1718 Make the u_fopen use the common code in u_finit.

Browse Source 
X-SVN-Rev: 8036
This commit is contained in:
George Rhoten 2002-03-15 00:28:52 +00:00
parent 8303b520a1
commit 05808a5cde
1 changed files with 9 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
icu4c/source/extra/ustdio/ufile.c
View File

@ -60,54 +60,16 @@ u_fopen(const char *filename,
const char *locale,
const char *codepage)
{
UErrorCode status = U_ZERO_ERROR;
UBool useSysCP = (UBool)(locale == 0 && codepage == 0);
UFILE *result = (UFILE*) uprv_malloc(sizeof(UFILE));
if(result == 0)
return 0;
result->fFile = fopen(filename, perm);
if(result->fFile == 0) {
uprv_free(result);
UFILE *result;
FILE *systemFile = fopen(filename, perm);
if(systemFile == 0) {
return 0;
}
result = u_finit(systemFile, locale, codepage);
result->fOwnFile = TRUE;
/* if locale is 0, use the default */
if(locale == 0)
locale = uloc_getDefault();
result->fBundle = u_loccache_get(locale);
if(result->fBundle == 0) {
fclose(result->fFile);
uprv_free(result);
return 0;
}
result->fTranslit = NULL;
result->fOwnBundle = FALSE;
result->fUCPos = result->fUCBuffer;
result->fUCLimit = result->fUCBuffer;
/* if the codepage is 0, use the default for the locale */
if(codepage == 0) {
codepage = uprv_defaultCodePageForLocale(locale);
/* if the codepage is still 0, the default codepage will be used */
}
/* if both locale and codepage are 0, use the system default codepage */
else if(useSysCP) {
codepage = 0;
}
result->fConverter = ucnv_open(codepage, &status);
if(U_FAILURE(status) || result->fConverter == 0) {
fclose(result->fFile);
uprv_free(result);
return 0;
}
return result;
}
@ -116,11 +78,12 @@ u_finit(FILE *f,
const char *locale,
const char *codepage)
{
UErrorCode status = U_ZERO_ERROR;
UBool useSysCP = (UBool)(locale == NULL && codepage == NULL);
UErrorCode status = U_ZERO_ERROR;
UBool useSysCP = (UBool)(locale == NULL && codepage == NULL);
UFILE *result = (UFILE*) uprv_malloc(sizeof(UFILE));
if(result == 0)
if(result == NULL || f == NULL) {
return 0;
}
#ifdef WIN32