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-721 simplify implementation

Browse source 
X-SVN-Rev: 2923
This commit is contained in:
Yves Arrouye 2000-11-17 02:02:11 +00:00
parent 799ea92ef4
commit bc81ac3774
4 changed files with 15 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
icu4c/source/common/ucnv.c
View file

@ -264,22 +264,6 @@ ucnv_getAliases(const char *alias, const char **aliases, UErrorCode *pErrorCode)
}
}
U_CAPI uint16_t
ucnv_countStandards(void) {
UErrorCode err = U_ZERO_ERROR;
return ucnv_io_countStandards(&err);
}
U_CAPI const char *
ucnv_getStandard(uint16_t n, UErrorCode *pErrorCode) {
return ucnv_io_getStandard(n, pErrorCode);
}
U_CAPI const char *
ucnv_getStandardName(const char *name, const char *standard, UErrorCode *pErrorCode) {
return ucnv_io_getStandardName(name, standard, pErrorCode);
}
void ucnv_getSubstChars (const UConverter * converter,
char *mySubChar,
int8_t * len,

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

@ -22,6 +22,7 @@
*/
#include "unicode/utypes.h"
#include "unicode/ucnv.h" /* This file implements ucnv_xXXX() APIs */
#include "umutex.h"
#include "cstring.h"
#include "cmemory.h"
@ -324,11 +325,12 @@ ucnv_io_getAlias(const char *alias, uint16_t n, UErrorCode *pErrorCode) {
return NULL;
}
U_CFUNC uint16_t
ucnv_io_countStandards(UErrorCode *pErrorCode) {
if (haveAliasData(pErrorCode)) {
U_CAPI uint16_t U_EXPORT2
ucnv_countStandards(void) {
UErrorCode errorCode = U_ZERO_ERROR;
if (haveAliasData(&errorCode)) {
if (!tagTable) {
*pErrorCode = U_INVALID_FORMAT_ERROR;
/* errorCode = U_INVALID_FORMAT_ERROR; */
return 0;
}
@ -338,8 +340,8 @@ ucnv_io_countStandards(UErrorCode *pErrorCode) {
return 0;
}
U_CFUNC const char *
ucnv_io_getStandard(uint16_t n, UErrorCode *pErrorCode) {
U_CAPI const char * U_EXPORT2
ucnv_getStandard(uint16_t n, UErrorCode *pErrorCode) {
if (haveAliasData(pErrorCode) && tagTable) {
int16_t count = (int16_t) *tagTable;
const char *tags = (const char *) (tagTable + 1 + count * *converterTable);
@ -354,8 +356,8 @@ ucnv_io_getStandard(uint16_t n, UErrorCode *pErrorCode) {
return NULL;
}
U_CFUNC const char *
ucnv_io_getStandardName(const char *alias, const char *standard, UErrorCode *pErrorCode) {
U_CFUNC const char * U_EXPORT2
ucnv_getStandardName(const char *alias, const char *standard, UErrorCode *pErrorCode) {
if (haveAliasData(pErrorCode) && isAlias(alias, pErrorCode)) {
const uint16_t *p = findAlias(alias);
if(p != NULL) {
@ -371,7 +373,7 @@ ucnv_io_getStandardName(const char *alias, const char *standard, UErrorCode *pEr
return NULL;
}
U_CFUNC uint16_t
U_CAPI uint16_t
ucnv_io_countAvailableConverters(UErrorCode *pErrorCode) {
if(haveAliasData(pErrorCode)) {
return *converterTable;

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

@ -44,31 +44,6 @@ ucnv_io_getAliases(const char *alias, const char **aliases, UErrorCode *pErrorCo
U_CFUNC const char *
ucnv_io_getAlias(const char *alias, uint16_t n, UErrorCode *pErrorCode);
/**
* Return the number of all standard names.
*/
U_CFUNC uint16_t
ucnv_io_countStandards(UErrorCode *pErrorCode);
/**
* Return the (n)th standard name in mixed case, or NULL
* if there is none (typically, if the data cannot be loaded).
* 0 <= index < ucnv_io_countStandards().
*/
U_CFUNC const char *
ucnv_io_getStandard(uint16_t n, UErrorCode *pErrorCode);
/**
* Map a converter alias name to a canonical converter name according to
* a given standard.
* The alias and standard are searched for case-insensitively, the converter
* name is returned in mixed-case.
* Returns NULL if the alias is not found, the standard does not exist, or
* the standard does not specify a name for the alias.
*/
U_CFUNC const char *
ucnv_io_getStandardName(const char *alias, const char *standard, UErrorCode *pErrorCode);
/**
* Return the number of all converter names.
*/

7
icu4c/source/common/unicode/ucnv.h
View file

@ -791,7 +791,7 @@ ucnv_getAliases(const char *alias, const char **aliases, UErrorCode *pErrorCode)
* @return number of standards
* @stable
*/
U_CAPI uint16_t
U_CAPI uint16_t U_EXPORT2
ucnv_countStandards(void);
/**
@ -801,7 +801,7 @@ ucnv_countStandards(void);
* @return returns the name of the standard at given index
* @stable
*/
U_CAPI const char *
U_CAPI const char * U_EXPORT2
ucnv_getStandard(uint16_t n, UErrorCode *pErrorCode);
/**
@ -815,7 +815,8 @@ ucnv_getStandard(uint16_t n, UErrorCode *pErrorCode);
* then <code>NULL</code> is returned
* @stable
*/
U_CAPI const char *ucnv_getStandardName(const char *name, const char *standard, UErrorCode *pErrorCode);
U_CAPI const char * U_EXPORT2
ucnv_getStandardName(const char *name, const char *standard, UErrorCode *pErrorCode);
/**
* returns the current default converter name.