organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-2787 Uncommit some code that shouldn't have been commited.

Browse source 
X-SVN-Rev: 11831
This commit is contained in:
George Rhoten 2003-05-07 16:39:24 +00:00
parent 92855acabc
commit d5cf52fce2
3 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icu4c/source/common/ucnv_bld.c
View file

@ -529,7 +529,6 @@ ucnv_createConverter(UConverter *myUConverter, const char *converterName, UError
UConverterSharedData *mySharedConverterData = NULL;
UErrorCode internalErrorCode = U_ZERO_ERROR;
uint32_t options = 0;
int32_t cnvNumber = -1;
if (U_FAILURE (*err))
return NULL;
@ -552,7 +551,7 @@ ucnv_createConverter(UConverter *myUConverter, const char *converterName, UError
}
/* get the canonical converter name */
realName = ucnv_io_getConverterName(cnvName, &cnvNumber, &internalErrorCode);
realName = ucnv_io_getConverterName(cnvName, &internalErrorCode);
if (U_FAILURE(internalErrorCode) || realName == NULL) {
/*
* set the input name in case the converter was added

10
icu4c/source/common/ucnv_io.c
View file

@ -574,20 +574,14 @@ findTaggedConverterNum(const char *alias, const char *standard, UErrorCode *pErr
U_CFUNC const char *
ucnv_io_getConverterName(const char *alias, int32_t *convNumPtr, UErrorCode *pErrorCode) {
ucnv_io_getConverterName(const char *alias, UErrorCode *pErrorCode) {
if(haveAliasData(pErrorCode) && isAlias(alias, pErrorCode)) {
uint32_t convNum = findConverter(alias, pErrorCode);
if (convNum < gConverterListSize) {
if (convNumPtr) {
*convNumPtr = (int32_t)convNum;
}
return GET_STRING(gConverterList[convNum]);
}
/* else converter not found */
}
if (convNumPtr) {
*convNumPtr = -1;
}
return NULL;
}
@ -1024,7 +1018,7 @@ ucnv_io_setDefaultConverterName(const char *converterName) {
gDefaultConverterName=NULL;
} else {
UErrorCode errorCode=U_ZERO_ERROR;
const char *name=ucnv_io_getConverterName(converterName, NULL, &errorCode);
const char *name=ucnv_io_getConverterName(converterName, &errorCode);
if(U_SUCCESS(errorCode) && name!=NULL) {
gDefaultConverterName=name;
} else {

3
icu4c/source/common/ucnv_io.h
View file

@ -36,12 +36,11 @@ ucnv_io_stripForCompare(char *dst, const char *name);
* is returned in mixed-case.
* Returns NULL if the alias is not found.
* @param alias The alias name to be searched.
* @param convNumPtr aAn out param for the index of the converter name in the alias table.
* @param pErrorCode The error code
* @return the converter name in mixed-case, return NULL if the alias is not found.
*/
U_CFUNC const char *
ucnv_io_getConverterName(const char *alias, int32_t *convNumPtr, UErrorCode *pErrorCode);
ucnv_io_getConverterName(const char *alias, UErrorCode *pErrorCode);
/**
* The count for ucnv_io_getAliases and ucnv_io_getAlias