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

ICU-721 undo unwarranted api change

Browse Source 
X-SVN-Rev: 2938
This commit is contained in:
Markus Scherer 2000-11-17 19:28:31 +00:00
parent 1c7ac10b56
commit 0348e0f62c
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/common/ucnv.c
View File

@ -264,6 +264,12 @@ 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);
}
void ucnv_getSubstChars (const UConverter * converter,
char *mySubChar,
int8_t * len,

4
icu4c/source/common/ucnv_io.c
View File

@ -325,8 +325,8 @@ ucnv_io_getAlias(const char *alias, uint16_t n, UErrorCode *pErrorCode) {
return NULL;
}
U_CAPI uint16_t U_EXPORT2
ucnv_countStandards(UErrorCode *pErrorCode) {
U_CFUNC uint16_t
ucnv_io_countStandards(UErrorCode *pErrorCode) {
if (haveAliasData(pErrorCode)) {
if (!tagTable) {
*pErrorCode = U_INVALID_FORMAT_ERROR;

6
icu4c/source/common/ucnv_io.h
View File

@ -44,6 +44,12 @@ 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 number of all converter names.
*/

3
icu4c/source/common/unicode/ucnv.h
View File

@ -825,12 +825,11 @@ ucnv_getAliases(const char *alias, const char **aliases, UErrorCode *pErrorCode)
/**
* Gives the number of standards associated to converter names.
* @param pErrorCode result of operation
* @return number of standards
* @stable
*/
U_CAPI uint16_t U_EXPORT2
ucnv_countStandards(UErrorCode *pErrorCode);
ucnv_countStandards(void);
/**
* Gives the name of the standard at given index of standard list.

2
icu4c/source/test/cintltst/stdnmtst.c
View File

@ -57,7 +57,7 @@ void TestStandardNames()
/* Iterate over all standards. */
for (i = 0, count = ucnv_countStandards(&err); i < count; ++i) {
for (i = 0, count = ucnv_countStandards(); i < count; ++i) {
const char *std;
err = U_ZERO_ERROR;