organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-6 more renaming of constant names

Browse source 
FAILURE -> U_FAILURE etc.

X-SVN-Rev: 76
This commit is contained in:
Markus Scherer 1999-10-18 22:48:32 +00:00
parent 579961ed20
commit 07a2bc0937
186 changed files with 3025 additions and 2941 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/bidi.h
View file

@ -143,7 +143,7 @@ inline BiDi::BiDi() {
}
inline BiDi::BiDi(UErrorCode &rErrorCode) {
if(SUCCESS(rErrorCode)) {
if(U_SUCCESS(rErrorCode)) {
pBiDi=ubidi_open();
if(pBiDi==0) {
rErrorCode=U_MEMORY_ALLOCATION_ERROR;

93
icu4c/source/common/common.dsp
View file

@ -70,6 +70,7 @@ LINK32=link.exe
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMMON_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMMON_EXPORTS" /D "U_COMMON_IMPLEMENTATION" /YX /FD /GZ /c
# SUBTRACT CPP /WX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -267,7 +268,7 @@ SOURCE=.\bidi.h
InputPath=.\bidi.h
"..\..\include\bidi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy bidi.h ..\..\include
copy bidi.h ..\..\include\
# End Custom Build
@ -277,7 +278,7 @@ InputPath=.\bidi.h
InputPath=.\bidi.h
"..\..\include\bidi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy bidi.h ..\..\include
copy bidi.h ..\..\include\
# End Custom Build
@ -294,7 +295,7 @@ SOURCE=.\chariter.h
InputPath=.\chariter.h
"..\..\include\chariter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy chariter.h ..\..\include
copy chariter.h ..\..\include\
# End Custom Build
@ -304,7 +305,7 @@ InputPath=.\chariter.h
InputPath=.\chariter.h
"..\..\include\chariter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy chariter.h ..\..\include
copy chariter.h ..\..\include\
# End Custom Build
@ -333,7 +334,7 @@ SOURCE=.\convert.h
InputPath=.\convert.h
"..\..\include\convert.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy convert.h ..\..\include
copy convert.h ..\..\include\
# End Custom Build
@ -343,7 +344,7 @@ InputPath=.\convert.h
InputPath=.\convert.h
"..\..\include\convert.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy convert.h ..\..\include
copy convert.h ..\..\include\
# End Custom Build
@ -380,7 +381,7 @@ SOURCE=.\locid.h
InputPath=.\locid.h
"..\..\include\locid.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy locid.h ..\..\include
copy locid.h ..\..\include\
# End Custom Build
@ -390,7 +391,7 @@ InputPath=.\locid.h
InputPath=.\locid.h
"..\..\include\locid.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy locid.h ..\..\include
copy locid.h ..\..\include\
# End Custom Build
@ -415,7 +416,7 @@ SOURCE=.\normlzr.h
InputPath=.\normlzr.h
"..\..\include\normlzr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy normlzr.h ..\..\include
copy normlzr.h ..\..\include\
# End Custom Build
@ -425,7 +426,7 @@ InputPath=.\normlzr.h
InputPath=.\normlzr.h
"..\..\include\normlzr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy normlzr.h ..\..\include
copy normlzr.h ..\..\include\
# End Custom Build
@ -442,7 +443,7 @@ SOURCE=.\putil.h
InputPath=.\putil.h
"..\..\include\putil.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy putil.h ..\..\include
copy putil.h ..\..\include\
# End Custom Build
@ -452,7 +453,7 @@ InputPath=.\putil.h
InputPath=.\putil.h
"..\..\include\putil.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy putil.h ..\..\include
copy putil.h ..\..\include\
# End Custom Build
@ -469,7 +470,7 @@ SOURCE=.\pwin32.h
InputPath=.\pwin32.h
"..\..\include\pwin32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy pwin32.h ..\..\include
copy pwin32.h ..\..\include\
# End Custom Build
@ -479,7 +480,7 @@ InputPath=.\pwin32.h
InputPath=.\pwin32.h
"..\..\include\pwin32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy pwin32.h ..\..\include
copy pwin32.h ..\..\include\
# End Custom Build
@ -508,7 +509,7 @@ SOURCE=.\resbund.h
InputPath=.\resbund.h
"..\..\include\resbund.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy resbund.h ..\..\include
copy resbund.h ..\..\include\
# End Custom Build
@ -518,7 +519,7 @@ InputPath=.\resbund.h
InputPath=.\resbund.h
"..\..\include\resbund.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy resbund.h ..\..\include
copy resbund.h ..\..\include\
# End Custom Build
@ -535,7 +536,7 @@ SOURCE=.\schriter.h
InputPath=.\schriter.h
"..\..\include\schriter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy schriter.h ..\..\include
copy schriter.h ..\..\include\
# End Custom Build
@ -545,7 +546,7 @@ InputPath=.\schriter.h
InputPath=.\schriter.h
"..\..\include\schriter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy schriter.h ..\..\include
copy schriter.h ..\..\include\
# End Custom Build
@ -562,7 +563,7 @@ SOURCE=.\scsu.h
InputPath=.\scsu.h
"..\..\include\scsu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy scsu.h ..\..\include
copy scsu.h ..\..\include\
# End Custom Build
@ -572,7 +573,7 @@ InputPath=.\scsu.h
InputPath=.\scsu.h
"..\..\include\scsu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy scsu.h ..\..\include
copy scsu.h ..\..\include\
# End Custom Build
@ -589,7 +590,7 @@ SOURCE=.\ubidi.h
InputPath=.\ubidi.h
"..\..\include\ubidi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ubidi.h ..\..\include
copy ubidi.h ..\..\include\
# End Custom Build
@ -599,7 +600,7 @@ InputPath=.\ubidi.h
InputPath=.\ubidi.h
"..\..\include\ubidi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ubidi.h ..\..\include
copy ubidi.h ..\..\include\
# End Custom Build
@ -620,7 +621,7 @@ SOURCE=.\uchar.h
InputPath=.\uchar.h
"..\..\include\uchar.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uchar.h ..\..\include
copy uchar.h ..\..\include\
# End Custom Build
@ -630,7 +631,7 @@ InputPath=.\uchar.h
InputPath=.\uchar.h
"..\..\include\uchar.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uchar.h ..\..\include
copy uchar.h ..\..\include\
# End Custom Build
@ -647,7 +648,7 @@ SOURCE=.\uchriter.h
InputPath=.\uchriter.h
"..\..\include\uchriter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uchriter.h ..\..\include
copy uchriter.h ..\..\include\
# End Custom Build
@ -657,7 +658,7 @@ InputPath=.\uchriter.h
InputPath=.\uchriter.h
"..\..\include\uchriter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uchriter.h ..\..\include
copy uchriter.h ..\..\include\
# End Custom Build
@ -686,7 +687,7 @@ SOURCE=.\ucnv.h
InputPath=.\ucnv.h
"..\..\include\ucnv.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv.h ..\..\include
copy ucnv.h ..\..\include\
# End Custom Build
@ -696,7 +697,7 @@ InputPath=.\ucnv.h
InputPath=.\ucnv.h
"..\..\include\ucnv.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv.h ..\..\include
copy ucnv.h ..\..\include\
# End Custom Build
@ -713,7 +714,7 @@ SOURCE=.\ucnv_bld.h
InputPath=.\ucnv_bld.h
"..\..\include\ucnv_bld.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv_bld.h ..\..\include
copy ucnv_bld.h ..\..\include\
# End Custom Build
@ -723,7 +724,7 @@ InputPath=.\ucnv_bld.h
InputPath=.\ucnv_bld.h
"..\..\include\ucnv_bld.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv_bld.h ..\..\include
copy ucnv_bld.h ..\..\include\
# End Custom Build
@ -744,7 +745,7 @@ SOURCE=.\ucnv_err.h
InputPath=.\ucnv_err.h
"..\..\include\ucnv_err.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv_err.h ..\..\include
copy ucnv_err.h ..\..\include\
# End Custom Build
@ -754,7 +755,7 @@ InputPath=.\ucnv_err.h
InputPath=.\ucnv_err.h
"..\..\include\ucnv_err.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv_err.h ..\..\include
copy ucnv_err.h ..\..\include\
# End Custom Build
@ -763,6 +764,10 @@ InputPath=.\ucnv_err.h
# End Source File
# Begin Source File
SOURCE=.\ucnv_imp.h
# End Source File
# Begin Source File
SOURCE=.\ucnv_io.h
# End Source File
# Begin Source File
@ -779,7 +784,7 @@ SOURCE=.\uloc.h
InputPath=.\uloc.h
"..\..\include\uloc.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uloc.h ..\..\include
copy uloc.h ..\..\include\
# End Custom Build
@ -789,7 +794,7 @@ InputPath=.\uloc.h
InputPath=.\uloc.h
"..\..\include\uloc.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uloc.h ..\..\include
copy uloc.h ..\..\include\
# End Custom Build
@ -841,7 +846,7 @@ SOURCE=.\unicode.h
InputPath=.\unicode.h
"..\..\include\unicode.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode.h ..\..\include
copy unicode.h ..\..\include\
# End Custom Build
@ -851,7 +856,7 @@ InputPath=.\unicode.h
InputPath=.\unicode.h
"..\..\include\unicode.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode.h ..\..\include
copy unicode.h ..\..\include\
# End Custom Build
@ -868,7 +873,7 @@ SOURCE=.\unistr.h
InputPath=.\unistr.h
"..\..\include\unistr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unistr.h ..\..\include
copy unistr.h ..\..\include\
# End Custom Build
@ -878,7 +883,7 @@ InputPath=.\unistr.h
InputPath=.\unistr.h
"..\..\include\unistr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unistr.h ..\..\include
copy unistr.h ..\..\include\
# End Custom Build
@ -899,7 +904,7 @@ SOURCE=.\ures.h
InputPath=.\ures.h
"..\..\include\ures.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ures.h ..\..\include
copy ures.h ..\..\include\
# End Custom Build
@ -909,7 +914,7 @@ InputPath=.\ures.h
InputPath=.\ures.h
"..\..\include\ures.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ures.h ..\..\include
copy ures.h ..\..\include\
# End Custom Build
@ -926,7 +931,7 @@ SOURCE=.\ustring.h
InputPath=.\ustring.h
"..\..\include\ustring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ustring.h ..\..\include
copy ustring.h ..\..\include\
# End Custom Build
@ -936,7 +941,7 @@ InputPath=.\ustring.h
InputPath=.\ustring.h
"..\..\include\ustring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ustring.h ..\..\include
copy ustring.h ..\..\include\
# End Custom Build
@ -953,7 +958,7 @@ SOURCE=.\utypes.h
InputPath=.\utypes.h
"..\..\include\utypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy utypes.h ..\..\include
copy utypes.h ..\..\include\
# End Custom Build
@ -963,7 +968,7 @@ InputPath=.\utypes.h
InputPath=.\utypes.h
"..\..\include\utypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy utypes.h ..\..\include
copy utypes.h ..\..\include\
# End Custom Build

26
icu4c/source/common/convert.cpp
View file

@ -39,7 +39,7 @@ UnicodeConverterCPP::UnicodeConverterCPP(const char* name, UErrorCode& err)
UnicodeConverterCPP::UnicodeConverterCPP(const UnicodeString& name, UErrorCode& err)
{
char myName[MAX_CONVERTER_NAME_LENGTH];
char myName[UCNV_MAX_CONVERTER_NAME_LENGTH];
int i;
name.extract(0, i = name.size(), myName);
myName[i]='\0';
@ -48,7 +48,7 @@ UnicodeConverterCPP::UnicodeConverterCPP(const UnicodeString& name, UErrorCode&
UnicodeConverterCPP::UnicodeConverterCPP(int32_t codepageNumber,
UCNV_PLATFORM platform,
UConverterPlatform platform,
UErrorCode& err)
{
myUnicodeConverter = ucnv_openCCSID(codepageNumber,
@ -122,7 +122,7 @@ UnicodeConverterCPP::fromUnicodeString(char* target,
UConverter myConverter;
char *myTarget = NULL;
if (FAILURE(err)) return;
if (U_FAILURE(err)) return;
if ((myUnicodeConverter == NULL) || source.isBogus() || (targetSize <= 0))
{
@ -166,7 +166,7 @@ UnicodeConverterCPP::toUnicodeString(UnicodeString& target,
int32_t myTargetUCharsLength = 0;
UConverter myConverter;
if (FAILURE(err)) return;
if (U_FAILURE(err)) return;
if ((myUnicodeConverter == NULL) || target.isBogus() || (sourceSize <= 0))
{
err = U_ILLEGAL_ARGUMENT_ERROR;
@ -319,13 +319,13 @@ UnicodeConverterCPP::getCodepage(UErrorCode& err) const
return ucnv_getCCSID(myUnicodeConverter, &err);
}
UCNV_ToUCallBack
UConverterToUCallback
UnicodeConverterCPP::getMissingCharAction() const
{
return ucnv_getToUCallBack(myUnicodeConverter);
}
UCNV_FromUCallBack
UConverterFromUCallback
UnicodeConverterCPP::getMissingUnicodeAction() const
{
return ucnv_getFromUCallBack(myUnicodeConverter);
@ -333,14 +333,14 @@ UnicodeConverterCPP::getMissingUnicodeAction() const
void
UnicodeConverterCPP::setMissingCharAction(UCNV_ToUCallBack action,
UnicodeConverterCPP::setMissingCharAction(UConverterToUCallback action,
UErrorCode& err)
{
ucnv_setToUCallBack(myUnicodeConverter, action, &err);
}
void
UnicodeConverterCPP::setMissingUnicodeAction(UCNV_FromUCallBack action,
UnicodeConverterCPP::setMissingUnicodeAction(UConverterFromUCallback action,
UErrorCode& err)
{
ucnv_setFromUCallBack(myUnicodeConverter, action, &err);
@ -354,14 +354,14 @@ UnicodeConverterCPP::getDisplayName(const Locale& displayLocale,
UErrorCode err = U_ZERO_ERROR;
ResourceBundle rb("", displayLocale, err);
char tablename[MAX_CONVERTER_NAME_LENGTH];
char tablename[UCNV_MAX_CONVERTER_NAME_LENGTH];
if (SUCCESS(err))
if (U_SUCCESS(err))
{
rb.getString(UnicodeString(tablename), displayName, err);
}
if (FAILURE(err))
if (U_FAILURE(err))
{
/*Error While creating the resource bundle use the internal name instead*/
displayName.remove();
@ -374,13 +374,13 @@ UnicodeConverterCPP::getDisplayName(const Locale& displayLocale,
}
UCNV_PLATFORM
UConverterPlatform
UnicodeConverterCPP::getCodepagePlatform(UErrorCode &err) const
{
return ucnv_getPlatform(myUnicodeConverter, &err);
}
UCNV_TYPE UnicodeConverterCPP::getType() const
UConverterType UnicodeConverterCPP::getType() const
{
return ucnv_getType(myUnicodeConverter);
}

14
icu4c/source/common/convert.h
View file

@ -68,7 +68,7 @@ class U_COMMON_API UnicodeConverterCPP
*
*/
UnicodeConverterCPP(int32_t codepageNumber,
UCNV_PLATFORM platform,
UConverterPlatform platform,
UErrorCode& err);
~UnicodeConverterCPP();
@ -182,7 +182,7 @@ int8_t getMinBytesPerChar(void) const;
* e.g. SBCS, MBCS, DBCS, UTF8, UTF16_BE, UTF16_LE, ISO_2022, EBCDIC_STATEFUL, LATIN_1
* @return the type of the converter
*/
UCNV_TYPE getType(void) const;
UConverterType getType(void) const;
/**
*Gets the "starter" bytes for the converters of type MBCS
@ -256,7 +256,7 @@ const char* getName( UErrorCode& err) const;
* @return the action constant when a Unicode character cannot be converted to a
* codepage equivalent
*/
UCNV_ToUCallBack getMissingCharAction(void) const;
UConverterToUCallback getMissingCharAction(void) const;
/**
* Return the current setting action taken when a unicode character is missing.
@ -264,14 +264,14 @@ const char* getName( UErrorCode& err) const;
* @return the action constant when a codepage character cannot be converted to a
* Unicode eqivalent
*/
UCNV_FromUCallBack getMissingUnicodeAction(void) const;
UConverterFromUCallback getMissingUnicodeAction(void) const;
/**
* Sets the current setting action taken when a character from a codepage is
* missing. (Currently STOP or SUBSTITUTE).
* @param action the action constant if an equivalent codepage character is missing
*/
void setMissingCharAction(UCNV_ToUCallBack action,
void setMissingCharAction(UConverterToUCallback action,
UErrorCode& err);
/**
@ -281,7 +281,7 @@ const char* getName( UErrorCode& err) const;
* @param action the action constant if an equivalent Unicode character is missing
* @param err the error status code
*/
void setMissingUnicodeAction(UCNV_FromUCallBack action,
void setMissingUnicodeAction(UConverterFromUCallback action,
UErrorCode& err);
/**
* Returns the localized name of the UnicodeConverter, if for any reason it is
@ -298,7 +298,7 @@ void getDisplayName(const Locale& displayLocale,
* @param err the error code status
* @return the codepages platform
*/
UCNV_PLATFORM getCodepagePlatform(UErrorCode& err) const;
UConverterPlatform getCodepagePlatform(UErrorCode& err) const;
UnicodeConverterCPP& operator=(const UnicodeConverterCPP& that);

2
icu4c/source/common/cpputils.cpp
View file

@ -27,7 +27,7 @@ void T_fillOutputParams(const UnicodeString* temp,
}
if (resultLengthOut) {
*resultLengthOut = actual;
if (SUCCESS(*status) && overflowed) {
if (U_SUCCESS(*status) && overflowed) {
*status = U_BUFFER_OVERFLOW_ERROR;
}
}

2
icu4c/source/common/cpputils.h
View file

@ -49,7 +49,7 @@ icu_arrayCopy(const UChar *src, int32_t srcStart,
* Simple utility to set output buffer parameters
******************************************************/
CAPI void U_EXPORT2 T_fillOutputParams(const UnicodeString* temp,
U_CAPI void U_EXPORT2 T_fillOutputParams(const UnicodeString* temp,
UChar* result,
const int32_t resultLength,
int32_t* resultLengthOut,

8
icu4c/source/common/cstring.h
View file

@ -56,16 +56,16 @@
#define icu_wcstombs(mbstr, wcstr, count) wcstombs(mbstr, wcstr, count)
#define icu_mbstowcs(wcstr, mbstr, count) mbstowcs(wcstr, mbstr, count)
CAPI char* U_EXPORT2
U_CAPI char* U_EXPORT2
T_CString_toLowerCase(char* str);
CAPI char* U_EXPORT2
U_CAPI char* U_EXPORT2
T_CString_toUpperCase(char* str);
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
T_CString_integerToString(char *buffer, int32_t n, int32_t radix);
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
T_CString_stringToInteger(const char *integerString, int32_t radix);
#endif /* ! CSTRING_H */

42
icu4c/source/common/filestrm.c
View file

@ -30,7 +30,7 @@
#include <stdio.h>
CAPI FileStream*
U_CAPI FileStream*
T_FileStream_open(const char* filename, const char* mode)
{
FILE *file = fopen(filename, mode);
@ -38,7 +38,7 @@ T_FileStream_open(const char* filename, const char* mode)
}
CAPI FileStream*
U_CAPI FileStream*
T_FileStream_wopen(const wchar_t* filename, const wchar_t* mode)
{
/* TBD: is _wfopen MS-specific? If so, change _WIN32 to WIN32 */
@ -69,13 +69,13 @@ T_FileStream_wopen(const wchar_t* filename, const wchar_t* mode)
#endif
}
CAPI void
U_CAPI void
T_FileStream_close(FileStream* fileStream)
{
if (fileStream != 0) fclose((FILE*)fileStream);
}
CAPI bool_t
U_CAPI bool_t
T_FileStream_file_exists(const char* filename)
{
FILE* temp = fopen(filename, "r");
@ -89,47 +89,47 @@ T_FileStream_file_exists(const char* filename)
/*static const int32_t kEOF;
const int32_t FileStream::kEOF = EOF;*/
CAPI FileStream*
U_CAPI FileStream*
T_FileStream_tmpfile()
{
FILE* file = tmpfile();
return (FileStream*)file;
}
CAPI int32_t
U_CAPI int32_t
T_FileStream_read(FileStream* fileStream, void* addr, int32_t len)
{
return fread(addr, 1, len, (FILE*)fileStream);
}
CAPI int32_t
U_CAPI int32_t
T_FileStream_write(FileStream* fileStream, const void* addr, int32_t len)
{
return fwrite(addr, 1, len, (FILE*)fileStream);
}
CAPI void
U_CAPI void
T_FileStream_rewind(FileStream* fileStream)
{
rewind((FILE*)fileStream);
}
CAPI int32_t
U_CAPI int32_t
T_FileStream_putc(FileStream* fileStream, int32_t ch)
{
int32_t c = fputc(ch, (FILE*)fileStream);
return c;
}
CAPI int
U_CAPI int
T_FileStream_getc(FileStream* fileStream)
{
int c = fgetc((FILE*)fileStream);
return c;
}
CAPI int32_t
U_CAPI int32_t
T_FileStream_ungetc(int32_t ch, FileStream* fileStream)
{
@ -137,7 +137,7 @@ T_FileStream_ungetc(int32_t ch, FileStream* fileStream)
return c;
}
CAPI int32_t
U_CAPI int32_t
T_FileStream_peek(FileStream* fileStream)
{
int32_t c = fgetc((FILE*)fileStream);
@ -145,19 +145,19 @@ T_FileStream_peek(FileStream* fileStream)
}
/*Added by Bertrand A. D. */
CAPI char *
U_CAPI char *
T_FileStream_readLine(FileStream* fileStream, char* buffer, int32_t length)
{
return fgets(buffer, length, (FILE*)fileStream);
}
CAPI int32_t
U_CAPI int32_t
T_FileStream_writeLine(FileStream* fileStream, const char* buffer)
{
return fputs(buffer, (FILE*)fileStream);
}
CAPI int32_t
U_CAPI int32_t
T_FileStream_size(FileStream* fileStream)
{
int32_t savedPos = ftell((FILE*)fileStream);
@ -171,19 +171,19 @@ T_FileStream_size(FileStream* fileStream)
return size;
}
CAPI int
U_CAPI int
T_FileStream_eof(FileStream* fileStream)
{
return feof((FILE*)fileStream);
}
CAPI int
U_CAPI int
T_FileStream_error(FileStream* fileStream)
{
return (fileStream == 0 || ferror((FILE*)fileStream));
}
CAPI void
U_CAPI void
T_FileStream_setError(FileStream* fileStream)
{
/* force the stream to set its error flag*/
@ -191,20 +191,20 @@ T_FileStream_setError(FileStream* fileStream)
}
CAPI FileStream*
U_CAPI FileStream*
T_FileStream_stdin(void)
{
return (FileStream*)stdin;
}
CAPI FileStream*
U_CAPI FileStream*
T_FileStream_stdout(void)
{
return (FileStream*)stdout;
}
CAPI FileStream*
U_CAPI FileStream*
T_FileStream_stderr(void)
{
return (FileStream*)stderr;

28
icu4c/source/common/locid.cpp
View file

@ -28,7 +28,7 @@
* Added getISOCountries(), getISOLanguages(),
* getLanguagesForCountry()
* 03/16/99 bertrand rehaul.
* 07/21/99 stephen Added C_FUNC setDefault
* 07/21/99 stephen Added U_CFUNC setDefault
*******************************************************************************
*/
@ -140,7 +140,7 @@ Locale::Locale()
Locale::Locale( const UnicodeString& newLanguage)
{
UnicodeString togo(newLanguage);
char myLocaleID[FULLNAME_CAPACITY];
char myLocaleID[ULOC_FULLNAME_CAPACITY];
int32_t size = newLanguage.size();
togo.extract(0,size, myLocaleID);
@ -152,7 +152,7 @@ Locale::Locale( const UnicodeString& newLanguage,
const UnicodeString& newCountry)
{
UnicodeString togo(newLanguage);
char myLocaleID[FULLNAME_CAPACITY];
char myLocaleID[ULOC_FULLNAME_CAPACITY];
togo += sep;
@ -173,7 +173,7 @@ Locale::Locale( const UnicodeString& newLanguage,
{
UnicodeString togo(newLanguage);
char myLocaleID[FULLNAME_CAPACITY];
char myLocaleID[ULOC_FULLNAME_CAPACITY];
UnicodeString newVariantCopy(newVariant);
@ -201,7 +201,7 @@ Locale::Locale( const UnicodeString& newLanguage,
/*is the variant is longer than our internal limit, we need
to go to the heap for temporary buffers*/
if (size > FULLNAME_CAPACITY)
if (size > ULOC_FULLNAME_CAPACITY)
{
char *togo_heap = new char[size+1];
togo.extract(0,size, togo_heap);
@ -227,7 +227,7 @@ Locale::Locale(const Locale& other)
icu_strcpy(country, other.country);
/*make fullName point to the heap if necessary*/
if ((j=icu_strlen(other.fullName)) > FULLNAME_CAPACITY)
if ((j=icu_strlen(other.fullName)) > ULOC_FULLNAME_CAPACITY)
{
fullName = new char[j+1];
}
@ -264,19 +264,19 @@ Locale& Locale::init(const char* localeID)
if (localeID == NULL) localeID = uloc_getDefault();
l = uloc_getLanguage(localeID,
this->language,
LANG_CAPACITY,
ULOC_LANG_CAPACITY,
&err);
l += k = uloc_getCountry(localeID,
this->country,
COUNTRY_CAPACITY,
ULOC_COUNTRY_CAPACITY,
&err);
l--; //adjust for the 2 zero terminators
/*Go to heap for the fullName if necessary*/
int j;
if ((j=icu_strlen(localeID)) > FULLNAME_CAPACITY)
if ((j=icu_strlen(localeID)) > ULOC_FULLNAME_CAPACITY)
{
this->fullName = new char[j+1];
}
@ -369,7 +369,7 @@ Locale::getDefault()
}
/* sfb 07/21/99 */
C_FUNC void
U_CFUNC void
locale_set_default(const char *id)
{
Locale::getDefault().init(id);
@ -380,7 +380,7 @@ void
Locale::setDefault( const Locale& newLocale,
UErrorCode& status)
{
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
uloc_setDefault(newLocale.fullName, &status);
@ -426,7 +426,7 @@ Locale::getISO3Language(UnicodeString& lang) const
UnicodeString&
Locale::getISO3Language(UnicodeString& lang, UErrorCode& status) const
{
if(FAILURE(status))
if(U_FAILURE(status))
return lang;
lang = uloc_getISO3Language(fullName);
@ -447,7 +447,7 @@ Locale::getISO3Country(UnicodeString& cntry) const
UnicodeString&
Locale::getISO3Country(UnicodeString& cntry, UErrorCode& status) const
{
if(FAILURE(status))
if(U_FAILURE(status))
return cntry;
cntry = uloc_getISO3Country(fullName);
@ -759,7 +759,7 @@ Locale::getLanguagesForCountry(const UnicodeString& country, int32_t& count)
if(ctry2LangMapping == 0) {
UErrorCode err = U_ZERO_ERROR;
UHashtable *temp = uhash_open(uhash_hashUString, &err);
if (FAILURE(err))
if (U_FAILURE(err))
{
count = 0;
return NULL;

13
icu4c/source/common/locid.h
View file

@ -171,10 +171,11 @@
* </blockquote>
*/
typedef struct ULocale ULocale;
typedef struct UHashtable UHashtable;
#define LANG_CAPACITY 3
#define COUNTRY_CAPACITY 3
#define FULLNAME_CAPACITY 50
#define ULOC_LANG_CAPACITY 3
#define ULOC_COUNTRY_CAPACITY 3
#define ULOC_FULLNAME_CAPACITY 50
class U_COMMON_API Locale
{
@ -532,11 +533,11 @@ private:
*/
void setHashCode(void);
char language[LANG_CAPACITY];
char country[COUNTRY_CAPACITY];
char language[ULOC_LANG_CAPACITY];
char country[ULOC_COUNTRY_CAPACITY];
char* variant;
char* fullName;
char fullNameBuffer[FULLNAME_CAPACITY];
char fullNameBuffer[ULOC_FULLNAME_CAPACITY];
int32_t khashCode;
static Locale *localeList;

4
icu4c/source/common/locmap.cpp
View file

@ -11,7 +11,7 @@
* *
*******************************************************************************
*/
// $Revision: 1.2 $
// $Revision: 1.3 $
//
// Provides functionality for mapping between
// LCID and Posix IDs.
@ -216,7 +216,7 @@ IGlobalLocales::convertToPosix(uint32_t hostid)
return ILcidPosixMap::fgWildCard;
}
C_FUNC const char*
U_CFUNC const char*
T_convertToPosix(int32_t hostid)
{
return IGlobalLocales::convertToPosix(hostid);

4
icu4c/source/common/locmap.h
View file

@ -10,7 +10,7 @@
* *
*****************************************************************************************
*/
// $Revision: 1.2 $
// $Revision: 1.3 $
//===============================================================================
//
// File locmap.hpp : Locale Mapping Classes
@ -120,7 +120,7 @@ private:
};
#else
CAPI const char* U_EXPORT2 T_convertToPosix(uint32_t hostid);
U_CAPI const char* U_EXPORT2 T_convertToPosix(uint32_t hostid);
#endif
#endif

8
icu4c/source/common/normlzr.cpp
View file

@ -169,7 +169,7 @@ Normalizer::compose(const UnicodeString& source,
UnicodeString& result,
UErrorCode &status)
{
if (FAILURE(status)) {
if (U_FAILURE(status)) {
return;
}
result.truncate(0);
@ -592,7 +592,7 @@ Normalizer::decompose(const UnicodeString& source,
UnicodeString& result,
UErrorCode &status)
{
if (FAILURE(status)) {
if (U_FAILURE(status)) {
return;
}
bool_t hangul = (options & IGNORE_HANGUL) == 0;
@ -1012,7 +1012,7 @@ void
Normalizer::setText(const UnicodeString& newText,
UErrorCode &status)
{
if (FAILURE(status)) {
if (U_FAILURE(status)) {
return;
}
CharacterIterator *newIter = new StringCharacterIterator(newText);
@ -1033,7 +1033,7 @@ void
Normalizer::setText(const CharacterIterator& newText,
UErrorCode &status)
{
if (FAILURE(status)) {
if (U_FAILURE(status)) {
return;
}
CharacterIterator *newIter = newText.clone();

17
icu4c/source/common/putil.c
View file

@ -133,19 +133,6 @@ icu_getUTCtime()
#endif
}
bool_t
icu_isBigEndian()
{
union
{
int16_t fShort;
int8_t fChars[2];
} testPattern;
testPattern.fShort = 0x1234;
return (testPattern.fChars[0] == 0x12);
}
/*-----------------------------------------------------------------------------
IEEE 754
These methods detect and return NaN and infinity values for doubles
@ -963,12 +950,12 @@ icu_nextDouble(double d, bool_t next)
static char*
u_topNBytesOfDouble(double* d, int n)
{
return icu_isBigEndian() ? (char*)d : (char*)(d + 1) - n;
return U_IS_BIG_ENDIAN ? (char*)d : (char*)(d + 1) - n;
}
static char* u_bottomNBytesOfDouble(double* d, int n)
{
return icu_isBigEndian() ? (char*)(d + 1) - n : (char*)d;
return U_IS_BIG_ENDIAN ? (char*)(d + 1) - n : (char*)d;
}
const char* icu_getDefaultCodepage()

24
icu4c/source/common/rbdata.cpp
View file

@ -20,9 +20,9 @@
#include "rbdata.h"
ClassID StringList::fgClassID = 0; // Value is irrelevant
ClassID String2dList::fgClassID = 0; // Value is irrelevant
ClassID TaggedList::fgClassID = 0; // Value is irrelevant
UClassID StringList::fgClassID = 0; // Value is irrelevant
UClassID String2dList::fgClassID = 0; // Value is irrelevant
UClassID TaggedList::fgClassID = 0; // Value is irrelevant
//-----------------------------------------------------------------------------
@ -42,13 +42,13 @@ const UnicodeString&
StringList::operator[](int32_t i) const
{ return fStrings[i]; }
ClassID
UClassID
StringList::getDynamicClassID() const
{ return getStaticClassID(); }
ClassID
UClassID
StringList::getStaticClassID()
{ return (ClassID)&fgClassID; }
{ return (UClassID)&fgClassID; }
//-----------------------------------------------------------------------------
@ -74,13 +74,13 @@ String2dList::getString(int32_t rowIndex,
int32_t colIndex)
{ return fStrings[rowIndex][colIndex]; }
ClassID
UClassID
String2dList::getDynamicClassID() const
{ return getStaticClassID(); }
ClassID
UClassID
String2dList::getStaticClassID()
{ return (ClassID)&fgClassID; }
{ return (UClassID)&fgClassID; }
//-----------------------------------------------------------------------------
@ -130,10 +130,10 @@ TaggedList::deleteValue(void *value)
}
ClassID
UClassID
TaggedList::getDynamicClassID() const
{ return getStaticClassID(); }
ClassID
UClassID
TaggedList::getStaticClassID()
{ return (ClassID)&fgClassID; }
{ return (UClassID)&fgClassID; }

32
icu4c/source/common/rbread.cpp
View file

@ -53,7 +53,7 @@ read_ustring(FileStream *rb,
int32_t len = 0, readLen = 0, remain = 0;
UChar buf [BUF_SIZE];
if(FAILURE(status)) return;
if(U_FAILURE(status)) return;
/* Read the string's length */
T_FileStream_read(rb, &len, sizeof(len));
@ -88,7 +88,7 @@ read_strlist(FileStream *rb,
int32_t i, count = 0;
StringList *retval;
if(FAILURE(status)) return 0;
if(U_FAILURE(status)) return 0;
/* Setup the string list */
retval = new StringList();
@ -99,7 +99,7 @@ read_strlist(FileStream *rb,
/* Read the name of this string list */
read_ustring(rb, listname, status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
delete retval;
return 0;
}
@ -121,7 +121,7 @@ read_strlist(FileStream *rb,
read_ustring(rb, retval->fStrings[i], status);
/* handle error */
if(FAILURE(status)) {
if(U_FAILURE(status)) {
delete [] retval->fStrings;
delete retval;
return 0;
@ -141,7 +141,7 @@ read_strlist2d(FileStream *rb,
int32_t rows, itemcount;
String2dList *retval;
if(FAILURE(status)) return 0;
if(U_FAILURE(status)) return 0;
/* Setup the 2-d string list */
retval = new String2dList();
@ -152,7 +152,7 @@ read_strlist2d(FileStream *rb,
/* Read the name of this 2-d string list */
read_ustring(rb, listname, status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
delete retval;
return 0;
}
@ -192,7 +192,7 @@ read_strlist2d(FileStream *rb,
read_ustring(rb, retval->fStrings[i][j], status);
/* handle error */
if(FAILURE(status)) {
if(U_FAILURE(status)) {
/* Complicated cleanup later */
delete retval;
return 0;
@ -213,7 +213,7 @@ read_taglist(FileStream *rb,
int32_t i, count = 0;
UnicodeString tag, value;
if(FAILURE(status)) return 0;
if(U_FAILURE(status)) return 0;
/* Setup the tagged list */
retval = new TaggedList();
@ -224,7 +224,7 @@ read_taglist(FileStream *rb,
/* Read the name of this tagged list */
read_ustring(rb, listname, status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
delete retval;
return 0;
}
@ -238,7 +238,7 @@ read_taglist(FileStream *rb,
read_ustring(rb, value, status);
/* handle error */
if(FAILURE(status)) {
if(U_FAILURE(status)) {
delete retval;
return 0;
}
@ -264,11 +264,11 @@ rb_parse(FileStream *f,
String2dList *strlist2d;
TaggedList *taglist;
if(FAILURE(status)) return 0;
if(U_FAILURE(status)) return 0;
/* Open the hashtable for saving data */
retval = uhash_open((UHashFunction)uhash_hashUString, &status);
if(retval == 0 || FAILURE(status)) {
if(retval == 0 || U_FAILURE(status)) {
status = U_MEMORY_ALLOCATION_ERROR;
return 0;
}
@ -286,7 +286,7 @@ rb_parse(FileStream *f,
/* Read the locale name from the file */
read_ustring(f, localename, status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
uhash_close(retval);
return 0;
}
@ -308,7 +308,7 @@ rb_parse(FileStream *f,
strlist = read_strlist(f, listname, status);
uhash_putKey(retval, listname.hashCode() & 0x7FFFFFFF,
strlist, &status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
uhash_close(retval);
return 0;
}
@ -318,7 +318,7 @@ rb_parse(FileStream *f,
strlist2d = read_strlist2d(f, listname, status);
uhash_putKey(retval, listname.hashCode() & 0x7FFFFFFF,
strlist2d, &status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
uhash_close(retval);
return 0;
}
@ -328,7 +328,7 @@ rb_parse(FileStream *f,
taglist = read_taglist(f, listname, status);
uhash_putKey(retval, listname.hashCode() & 0x7FFFFFFF,
taglist, &status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
uhash_close(retval);
return 0;
}

62
icu4c/source/common/resbund.cpp
View file

@ -401,7 +401,7 @@ ResourceBundle::constructForLocale(const PathInfo& path,
fData[0] = getHashtableForLocale(fRealLocaleID, returnedLocale, error);
fLoaded[0] = TRUE;
fDataStatus[0] = U_ZERO_ERROR;
if(SUCCESS(error))
if(U_SUCCESS(error))
fRealLocaleID = returnedLocale;
fLocaleIterator = new LocaleFallbackIterator(fRealLocaleID,
@ -423,7 +423,7 @@ ResourceBundle::getHashtableForLocale(const UnicodeString& desiredLocale,
UnicodeString& returnedLocale,
UErrorCode& error)
{
if(FAILURE(error)) return 0;
if(U_FAILURE(error)) return 0;
error = U_ZERO_ERROR;
const UHashtable* h = getFromCache(fPath, desiredLocale, fgCache);
@ -448,14 +448,14 @@ ResourceBundle::getHashtableForLocale(const UnicodeString& desiredLocale,
// Build a filename for the locale.
if(parseIfUnparsed(fPath, iterator.getLocale(),
fgCache, fgVisitedFiles, error)) {
if(FAILURE(error))
if(U_FAILURE(error))
return 0;
error = U_ZERO_ERROR;
h = getFromCacheWithFallback(fPath, desiredLocale,
returnedLocale, fgCache, error);
didTryCacheWithFallback = TRUE;
if(h != 0 && SUCCESS(error))
if(h != 0 && U_SUCCESS(error))
return h;
}
@ -486,7 +486,7 @@ const UHashtable*
ResourceBundle::getHashtableForLocale(const UnicodeString& desiredLocale,
UErrorCode& error)
{
if(FAILURE(error))
if(U_FAILURE(error))
return 0;
error = U_ZERO_ERROR;
@ -502,7 +502,7 @@ ResourceBundle::getHashtableForLocale(const UnicodeString& desiredLocale,
UErrorCode parseError = U_ZERO_ERROR;
if(parseIfUnparsed(fPath, iterator.getLocale(),
fgCache, fgVisitedFiles, parseError)) {
if(FAILURE(parseError)) {
if(U_FAILURE(parseError)) {
error = parseError;
return 0;
}
@ -529,7 +529,7 @@ ResourceBundle::getFromCacheWithFallback(const PathInfo& path,
ResourceBundleCache* fgCache,
UErrorCode& error)
{
if(FAILURE(error))
if(U_FAILURE(error))
return 0;
error = U_ZERO_ERROR;
@ -628,11 +628,11 @@ ResourceBundle::getString( const UnicodeString& resourceTag,
UnicodeString& theString,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return;
const UnicodeString* temp = getString(resourceTag, err);
if(SUCCESS(err))
if(U_SUCCESS(err))
theString = *temp;
}
@ -640,7 +640,7 @@ const UnicodeString*
ResourceBundle::getString( const UnicodeString& resourceTag,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return NULL;
const ResourceBundleData* data = getDataForTag(resourceTag, err);
@ -658,7 +658,7 @@ ResourceBundle::getStringArray( const UnicodeString& resourceTag,
int32_t& count,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return 0;
const ResourceBundleData* data = getDataForTag(resourceTag, err);
@ -677,11 +677,11 @@ ResourceBundle::getArrayItem( const UnicodeString& resourceTag,
UnicodeString& theArrayItem,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return;
const UnicodeString* temp = getArrayItem(resourceTag, index, err);
if(SUCCESS(err))
if(U_SUCCESS(err))
theArrayItem = *temp;
}
@ -690,7 +690,7 @@ ResourceBundle::getArrayItem( const UnicodeString& resourceTag,
int32_t index,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return NULL;
// Casting to unsigned turns a signed value into a large unsigned
@ -714,7 +714,7 @@ ResourceBundle::get2dArray(const UnicodeString& resourceTag,
int32_t& columnCount,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return 0;
const ResourceBundleData* data = getDataForTag(resourceTag, err);
@ -737,13 +737,13 @@ ResourceBundle::get2dArrayItem(const UnicodeString& resourceTag,
UnicodeString& theArrayItem,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return;
const UnicodeString* temp = get2dArrayItem(resourceTag, rowIndex,
columnIndex, err);
if(SUCCESS(err))
if(U_SUCCESS(err))
theArrayItem = *temp;
}
@ -753,7 +753,7 @@ ResourceBundle::get2dArrayItem(const UnicodeString& resourceTag,
int32_t columnIndex,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return NULL;
const ResourceBundleData* data = getDataForTag(resourceTag, err);
@ -779,12 +779,12 @@ ResourceBundle::getTaggedArrayItem( const UnicodeString& resourceTag,
UnicodeString& theArrayItem,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return;
const UnicodeString* temp = getTaggedArrayItem(resourceTag, itemTag, err);
if(SUCCESS(err))
if(U_SUCCESS(err))
theArrayItem = *temp;
}
@ -793,7 +793,7 @@ ResourceBundle::getTaggedArrayItem( const UnicodeString& resourceTag,
const UnicodeString& itemTag,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return NULL;
const ResourceBundleData* data = getDataForTag(resourceTag, err);
@ -841,11 +841,11 @@ getTaggedArrayUCharsImplementation( const ResourceBundle* bundle,
// ResourceBundle. This function isn't defined as part of the API;
// The C wrappers know it's here and define it on their own. --jf
// 12/16/98
if(FAILURE(err))
if(U_FAILURE(err))
return;
const ResourceBundleData* data = bundle->getDataForTag(resourceTag, err);
if(FAILURE(err) || data == 0
if(U_FAILURE(err) || data == 0
|| data->getDynamicClassID() != TaggedList::getStaticClassID()) {
err = U_MISSING_RESOURCE_ERROR;
return;
@ -874,11 +874,11 @@ ResourceBundle::getTaggedArray( const UnicodeString& resourceTag,
int32_t& numItems,
UErrorCode& err) const
{
if(FAILURE(err))
if(U_FAILURE(err))
return;
const ResourceBundleData* data = getDataForTag(resourceTag, err);
if(FAILURE(err) || data == 0
if(U_FAILURE(err) || data == 0
|| data->getDynamicClassID() != TaggedList::getStaticClassID()) {
err = U_MISSING_RESOURCE_ERROR;
return;
@ -923,7 +923,7 @@ ResourceBundle::getVersionNumber() const
// the end).
int32_t len = icu_strlen(ICU_VERSION);
int32_t minor_len = 0;
if(SUCCESS(status) && minor_version.size() > 0)
if(U_SUCCESS(status) && minor_version.size() > 0)
minor_len = minor_version.size();
len += (minor_len > 0) ? minor_len : 1 /*==icu_strlen(kDefaultMinorVersion)*/;
++len; // Add length of separator
@ -1010,7 +1010,7 @@ T_ResourceBundle_countArrayItemsImplementation(const ResourceBundle* resourceBun
const char* resourceKey,
UErrorCode& err)
{
if(FAILURE(err))
if(U_FAILURE(err))
return 0;
if(!resourceKey) {
@ -1019,10 +1019,10 @@ T_ResourceBundle_countArrayItemsImplementation(const ResourceBundle* resourceBun
}
const ResourceBundleData* data = resourceBundle->getDataForTag(resourceKey,
err);
if(FAILURE(err))
if(U_FAILURE(err))
return 0;
ClassID rbkeyClassID = data->getDynamicClassID();
UClassID rbkeyClassID = data->getDynamicClassID();
int32_t numItems = 0;
if(rbkeyClassID == StringList::getStaticClassID()) {
@ -1083,7 +1083,7 @@ ResourceBundle::parse(const PathInfo& path,
UnicodeString localeName;
UHashtable *data;
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
f = path.openFile(locale);
if(f == 0) {
@ -1097,7 +1097,7 @@ ResourceBundle::parse(const PathInfo& path,
/* Close the file */
T_FileStream_close(f);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
return;
}

2
icu4c/source/common/resbund.h
View file

@ -167,7 +167,7 @@ public:
* returned by Locale::getDefault()) will be used.
* The UErrorCode& err parameter is used to return status information to the user. To
* check whether the construction succeeded or not, you should check the value of
* SUCCESS(err). If you wish more detailed information, you can check for
* U_SUCCESS(err). If you wish more detailed information, you can check for
* informational error results which still indicate success. U_USING_FALLBACK_ERROR
* indicates that a fall back locale was used. For example, 'de_CH' was requested,
* but nothing was found there, so 'de' was used. U_USING_DEFAULT_ERROR indicates that

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

@ -273,7 +273,7 @@ scsu_compress(UnicodeCompressor *comp,
/* verify we weren't passed a failing error code */
if(FAILURE(*status)) {
if(U_FAILURE(*status)) {
return;
}
/* verify the target buffer can hold at least 4 bytes */
@ -864,7 +864,7 @@ scsu_decompress(UnicodeCompressor *comp,
/* verify we weren't passed a failing error code */
if(FAILURE(*status)) {
if(U_FAILURE(*status)) {
return;
}
/* verify the target buffer can hold at least 1 UChar */
@ -879,11 +879,11 @@ scsu_decompress(UnicodeCompressor *comp,
int32_t newBytes = 0;
const uint8_t *newSource = comp->fBuffer;
const uint8_t *newSourceLimit = comp->fBuffer + SCSU_BUFSIZE;
const uint8_t *newSourceLimit = comp->fBuffer + USCSU_BUFSIZE;
/* fill the buffer completely, to guarantee one full character */
if(comp->fBufferLength != SCSU_BUFSIZE) {
newBytes = SCSU_BUFSIZE - comp->fBufferLength;
if(comp->fBufferLength != USCSU_BUFSIZE) {
newBytes = USCSU_BUFSIZE - comp->fBufferLength;
/* verify there are newBytes bytes in byteBuffer */
if(sourceLimit - byteBuffer < newBytes)
@ -1249,12 +1249,12 @@ scsu_reset(UnicodeCompressor *comp)
comp->fOffsets[7] = 0xFF00; /* Fullwidth ASCII*/
/* reset time stamps*/
for(i = 0; i < NUMWINDOWS; i++) {
for(i = 0; i < USCSU_NUM_WINDOWS; i++) {
comp->fTimeStamps[i] = 0;
}
/* reset count of seen indices*/
for( i = 0; i <= MAXINDEX; i++ ) {
for( i = 0; i <= USCSU_MAX_INDEX; i++ ) {
comp->fIndexCount[i] = 0;
}
@ -1355,7 +1355,7 @@ scsu_findDynamicWindow(const UnicodeCompressor *comp,
{
int32_t i;
for(i = 0; i < NUMWINDOWS; i++) {
for(i = 0; i < USCSU_NUM_WINDOWS; i++) {
if(scsu_inDynamicWindow(comp, c, i)) {
return i;
}
@ -1375,7 +1375,7 @@ scsu_findStaticWindow(int32_t c)
{
int32_t i;
for(i = 0; i < NUMSTATICWINDOWS; i++) {
for(i = 0; i < USCSU_NUM_STATIC_WINDOWS; i++) {
if(scsu_inStaticWindow(c, i)) {
return i;
}
@ -1393,7 +1393,7 @@ scsu_getLRDefinedWindow(const UnicodeCompressor *comp)
int32_t i;
/* find least recently used window*/
for(i = 0; i < NUMWINDOWS; i++ ) {
for(i = 0; i < USCSU_NUM_WINDOWS; i++ ) {
if(comp->fTimeStamps[i] < leastRU) {
leastRU = comp->fTimeStamps[i];
whichWindow = i;

24
icu4c/source/common/scsu.h
View file

@ -25,14 +25,14 @@
#include "utypes.h"
/* Number of windows */
#define NUMWINDOWS 8
#define NUMSTATICWINDOWS 8
#define USCSU_NUM_WINDOWS 8
#define USCSU_NUM_STATIC_WINDOWS 8
/* Maximum value for a window's index */
#define MAXINDEX 0xFF
#define USCSU_MAX_INDEX 0xFF
/** The size of the internal buffer for a UnicodeCompressor */
#define SCSU_BUFSIZE 3
#define USCSU_BUFSIZE 3
/** The UnicodeCompressor struct */
struct UnicodeCompressor {
@ -41,22 +41,22 @@ struct UnicodeCompressor {
int32_t fCurrentWindow;
/** Dynamic compression window offsets */
int32_t fOffsets [ NUMWINDOWS ];
int32_t fOffsets [ USCSU_NUM_WINDOWS ];
/** Current compression mode */
int32_t fMode;
/** Keeps count of times character indices are encountered */
int32_t fIndexCount [ MAXINDEX + 1 ];
int32_t fIndexCount [ USCSU_MAX_INDEX + 1 ];
/** The time stamps indicate when a window was last defined */
int32_t fTimeStamps [ NUMWINDOWS ];
int32_t fTimeStamps [ USCSU_NUM_WINDOWS ];
/** The current time stamp */
int32_t fTimeStamp;
/** Internal buffer for saving state */
uint8_t fBuffer [ SCSU_BUFSIZE ];
uint8_t fBuffer [ USCSU_BUFSIZE ];
/** Number of characters in our internal buffer */
int32_t fBufferLength;
@ -68,13 +68,13 @@ typedef struct UnicodeCompressor UnicodeCompressor;
* Sets all windows to their default values.
* @see #reset
*/
CAPI void U_EXPORT2 scsu_init(UnicodeCompressor *comp);
U_CAPI void U_EXPORT2 scsu_init(UnicodeCompressor *comp);
/**
* Reset the compressor to its initial state.
* @param comp The UnicodeCompressor to reset.
*/
CAPI void U_EXPORT2 scsu_reset(UnicodeCompressor *comp);
U_CAPI void U_EXPORT2 scsu_reset(UnicodeCompressor *comp);
/**
* Compress a Unicode character array into a byte array.
@ -101,7 +101,7 @@ CAPI void U_EXPORT2 scsu_reset(UnicodeCompressor *comp);
*
* @see #decompress
*/
CAPI void U_EXPORT2 scsu_compress(UnicodeCompressor *comp,
U_CAPI void U_EXPORT2 scsu_compress(UnicodeCompressor *comp,
uint8_t **target,
const uint8_t *targetLimit,
const UChar **source,
@ -135,7 +135,7 @@ CAPI void U_EXPORT2 scsu_compress(UnicodeCompressor *comp,
*
* @see #compress
*/
CAPI void U_EXPORT2 scsu_decompress(UnicodeCompressor *comp,
U_CAPI void U_EXPORT2 scsu_decompress(UnicodeCompressor *comp,
UChar **target,
const UChar *targetLimit,
const uint8_t **source,

22
icu4c/source/common/ubidi.c
View file

@ -134,18 +134,18 @@ adjustWSLevels(UBiDi *pBiDi);
/* UBiDi object management -------------------------------------------------- */
CAPI UBiDi * U_EXPORT2
U_CAPI UBiDi * U_EXPORT2
ubidi_open() {
UErrorCode errorCode=U_ZERO_ERROR;
return ubidi_openSized(0, 0, &errorCode);
}
CAPI UBiDi * U_EXPORT2
U_CAPI UBiDi * U_EXPORT2
ubidi_openSized(UTextOffset maxLength, UTextOffset maxRunCount, UErrorCode *pErrorCode) {
UBiDi *pBiDi;
/* check the argument values */
if(pErrorCode==NULL || FAILURE(*pErrorCode)) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
return NULL;
} else if(maxLength<0 || maxRunCount<0) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
@ -184,7 +184,7 @@ ubidi_openSized(UTextOffset maxLength, UTextOffset maxRunCount, UErrorCode *pErr
pBiDi->mayAllocateRuns=TRUE;
}
if(SUCCESS(*pErrorCode)) {
if(U_SUCCESS(*pErrorCode)) {
return pBiDi;
} else {
ubidi_close(pBiDi);
@ -240,7 +240,7 @@ getMemory(void **pMemory, UTextOffset *pSize, bool_t mayAllocate, UTextOffset si
}
}
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_close(UBiDi *pBiDi) {
if(pBiDi!=NULL) {
if(pBiDi->dirPropsMemory!=NULL) {
@ -258,14 +258,14 @@ ubidi_close(UBiDi *pBiDi) {
/* ubidi_setPara ------------------------------------------------------------ */
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_setPara(UBiDi *pBiDi, const UChar *text, UTextOffset length,
UBiDiLevel paraLevel, UBiDiLevel *embeddingLevels,
UErrorCode *pErrorCode) {
UBiDiDirection direction;
/* check the argument values */
if(pErrorCode==NULL || FAILURE(*pErrorCode)) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
return;
} else if(pBiDi==NULL || text==NULL ||
(UBIDI_MAX_EXPLICIT_LEVEL<paraLevel) && !IS_DEFAULT_LEVEL(paraLevel) ||
@ -339,7 +339,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, UTextOffset length,
/* set BN for all explicit codes, check that all levels are paraLevel..UBIDI_MAX_EXPLICIT_LEVEL */
pBiDi->levels=embeddingLevels;
direction=checkExplicitLevels(pBiDi, pErrorCode);
if(FAILURE(*pErrorCode)) {
if(U_FAILURE(*pErrorCode)) {
return;
}
}
@ -1126,7 +1126,7 @@ adjustWSLevels(UBiDi *pBiDi) {
/* -------------------------------------------------------------------------- */
CAPI UBiDiDirection U_EXPORT2
U_CAPI UBiDiDirection U_EXPORT2
ubidi_getDirection(const UBiDi *pBiDi) {
if(pBiDi!=NULL) {
return pBiDi->direction;
@ -1135,7 +1135,7 @@ ubidi_getDirection(const UBiDi *pBiDi) {
}
}
CAPI UTextOffset U_EXPORT2
U_CAPI UTextOffset U_EXPORT2
ubidi_getLength(const UBiDi *pBiDi) {
if(pBiDi!=NULL) {
return pBiDi->length;
@ -1144,7 +1144,7 @@ ubidi_getLength(const UBiDi *pBiDi) {
}
}
CAPI UBiDiLevel U_EXPORT2
U_CAPI UBiDiLevel U_EXPORT2
ubidi_getParaLevel(const UBiDi *pBiDi) {
if(pBiDi!=NULL) {
return pBiDi->paraLevel;

48
icu4c/source/common/ubidi.h
View file

@ -164,7 +164,7 @@ typedef struct UBiDi UBiDi;
*
* @return An empty <code>UBiDi</code> object.
*/
CAPI UBiDi * U_EXPORT2
U_CAPI UBiDi * U_EXPORT2
ubidi_open();
/**
@ -201,7 +201,7 @@ ubidi_open();
*
* @return An empty <code>UBiDi</code> object with preallocated memory.
*/
CAPI UBiDi * U_EXPORT2
U_CAPI UBiDi * U_EXPORT2
ubidi_openSized(UTextOffset maxLength, UTextOffset maxRunCount, UErrorCode *pErrorCode);
/**
@ -221,7 +221,7 @@ ubidi_openSized(UTextOffset maxLength, UTextOffset maxRunCount, UErrorCode *pErr
* @see ubidi_setPara
* @see ubidi_setLine
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_close(UBiDi *pBiDi);
/**
@ -292,7 +292,7 @@ ubidi_close(UBiDi *pBiDi);
* @param pErrorCode must be a valid pointer to an error code value,
* which must not indicate a failure before the function call.
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_setPara(UBiDi *pBiDi, const UChar *text, UTextOffset length,
UBiDiLevel paraLevel, UBiDiLevel *embeddingLevels,
UErrorCode *pErrorCode);
@ -335,7 +335,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, UTextOffset length,
*
* @see ubidi_setPara
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_setLine(const UBiDi *pParaBiDi,
UTextOffset start, UTextOffset limit,
UBiDi *pLineBiDi,
@ -352,7 +352,7 @@ ubidi_setLine(const UBiDi *pParaBiDi,
*
* @see UBiDiDirection
*/
CAPI UBiDiDirection U_EXPORT2
U_CAPI UBiDiDirection U_EXPORT2
ubidi_getDirection(const UBiDi *pBiDi);
/**
@ -362,7 +362,7 @@ ubidi_getDirection(const UBiDi *pBiDi);
*
* @return The length of the text that the UBiDi object was created for.
*/
CAPI UTextOffset U_EXPORT2
U_CAPI UTextOffset U_EXPORT2
ubidi_getLength(const UBiDi *pBiDi);
/**
@ -374,7 +374,7 @@ ubidi_getLength(const UBiDi *pBiDi);
*
* @see UBiDiLevel
*/
CAPI UBiDiLevel U_EXPORT2
U_CAPI UBiDiLevel U_EXPORT2
ubidi_getParaLevel(const UBiDi *pBiDi);
/**
@ -388,7 +388,7 @@ ubidi_getParaLevel(const UBiDi *pBiDi);
*
* @see UBiDiLevel
*/
CAPI UBiDiLevel U_EXPORT2
U_CAPI UBiDiLevel U_EXPORT2
ubidi_getLevelAt(const UBiDi *pBiDi, UTextOffset charIndex);
/**
@ -407,7 +407,7 @@ ubidi_getLevelAt(const UBiDi *pBiDi, UTextOffset charIndex);
*
* @see UBiDiLevel
*/
CAPI const UBiDiLevel * U_EXPORT2
U_CAPI const UBiDiLevel * U_EXPORT2
ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode);
/**
@ -431,7 +431,7 @@ ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode);
* This pointer can be <code>NULL</code> if this
* value is not necessary.
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_getLogicalRun(const UBiDi *pBiDi, UTextOffset logicalStart,
UTextOffset *pLogicalLimit, UBiDiLevel *pLevel);
@ -450,7 +450,7 @@ ubidi_getLogicalRun(const UBiDi *pBiDi, UTextOffset logicalStart,
*
* @return The number of runs.
*/
CAPI UTextOffset U_EXPORT2
U_CAPI UTextOffset U_EXPORT2
ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode);
/**
@ -501,7 +501,7 @@ ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode);
* modifier letters before base characters and second surrogates
* before first ones.
*/
CAPI UBiDiDirection U_EXPORT2
U_CAPI UBiDiDirection U_EXPORT2
ubidi_getVisualRun(UBiDi *pBiDi, UTextOffset runIndex,
UTextOffset *pLogicalStart, UTextOffset *pLength);
@ -527,7 +527,7 @@ ubidi_getVisualRun(UBiDi *pBiDi, UTextOffset runIndex,
* @see ubidi_getLogicalMap
* @see ubidi_getLogicalIndex
*/
CAPI UTextOffset U_EXPORT2
U_CAPI UTextOffset U_EXPORT2
ubidi_getVisualIndex(UBiDi *pBiDi, UTextOffset logicalIndex, UErrorCode *pErrorCode);
/**
@ -550,7 +550,7 @@ ubidi_getVisualIndex(UBiDi *pBiDi, UTextOffset logicalIndex, UErrorCode *pErrorC
* @see ubidi_getVisualMap
* @see ubidi_getVisualIndex
*/
CAPI UTextOffset U_EXPORT2
U_CAPI UTextOffset U_EXPORT2
ubidi_getLogicalIndex(UBiDi *pBiDi, UTextOffset visualIndex, UErrorCode *pErrorCode);
/**
@ -570,7 +570,7 @@ ubidi_getLogicalIndex(UBiDi *pBiDi, UTextOffset visualIndex, UErrorCode *pErrorC
* @see ubidi_getVisualMap
* @see ubidi_getVisualIndex
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_getLogicalMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode);
/**
@ -590,7 +590,7 @@ ubidi_getLogicalMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode)
* @see ubidi_getLogicalMap
* @see ubidi_getLogicalIndex
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_getVisualMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode);
/**
@ -612,7 +612,7 @@ ubidi_getVisualMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode);
* The array does not need to be initialized.<p>
* The index map will result in <code>indexMap[logicalIndex]==visualIndex</code>.
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_reorderLogical(const UBiDiLevel *levels, UTextOffset length, UTextOffset *indexMap);
/**
@ -634,7 +634,7 @@ ubidi_reorderLogical(const UBiDiLevel *levels, UTextOffset length, UTextOffset *
* The array does not need to be initialized.<p>
* The index map will result in <code>indexMap[visualIndex]==logicalIndex</code>.
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_reorderVisual(const UBiDiLevel *levels, UTextOffset length, UTextOffset *indexMap);
/**
@ -650,7 +650,7 @@ ubidi_reorderVisual(const UBiDiLevel *levels, UTextOffset length, UTextOffset *i
*
* @param length is the length of each array.
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset length);
/**
@ -776,7 +776,7 @@ ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset len
*&nbsp; UBiDiLevel level;
*&nbsp;
*&nbsp; count=ubidi_countRuns(para, pErrorCode);
*&nbsp; if(SUCCESS(*pErrorCode)) {
*&nbsp; if(U_SUCCESS(*pErrorCode)) {
*&nbsp; if(styleRunCount&lt;=1) {
*&nbsp; Style style=styleRuns[0].style;
*&nbsp;
@ -806,7 +806,7 @@ ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset len
*&nbsp; UErrorCode *pErrorCode) {
*&nbsp; UBiDi *para;
*&nbsp;
*&nbsp; if(pErrorCode==NULL || FAILURE(*pErrorCode) || length&lt;=0) {
*&nbsp; if(pErrorCode==NULL || U_FAILURE(*pErrorCode) || length&lt;=0) {
*&nbsp; return;
*&nbsp; }
*&nbsp;
@ -816,7 +816,7 @@ ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset len
*&nbsp; ubidi_setPara(para, text, length,
*&nbsp; textDirection ? UBIDI_DEFAULT_RTL : UBIDI_DEFAULT_LTR,
*&nbsp; NULL, pErrorCode);
*&nbsp; if(SUCCESS(*pErrorCode)) {
*&nbsp; if(U_SUCCESS(*pErrorCode)) {
*&nbsp; UBiDiLevel paraLevel=1&ubidi_getParaLevel(para);
*&nbsp; StyleRun styleRun={ length, styleNormal };
*&nbsp; int width;
@ -853,7 +853,7 @@ ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset len
*&nbsp; styleRuns, styleRunStart, &styleRunLimit,
*&nbsp; &width);
*&nbsp; ubidi_setLine(para, start, limit, line, pErrorCode);
*&nbsp; if(SUCCESS(*pErrorCode)) {
*&nbsp; if(U_SUCCESS(*pErrorCode)) {
*&nbsp; // prepare rendering a new line
*&nbsp; // from either left or right
*&nbsp; startLine(paraLevel, width);

36
icu4c/source/common/ubidiln.c
View file

@ -100,7 +100,7 @@ prepareReorder(const UBiDiLevel *levels, UTextOffset length,
/* ubidi_setLine ------------------------------------------------------------ */
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_setLine(const UBiDi *pParaBiDi,
UTextOffset start, UTextOffset limit,
UBiDi *pLineBiDi,
@ -108,7 +108,7 @@ ubidi_setLine(const UBiDi *pParaBiDi,
UTextOffset length;
/* check the argument values */
if(pErrorCode==NULL || FAILURE(*pErrorCode)) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
return;
} else if(pParaBiDi==NULL || pLineBiDi==NULL) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
@ -214,7 +214,7 @@ ubidi_setLine(const UBiDi *pParaBiDi,
return;
}
CAPI UBiDiLevel U_EXPORT2
U_CAPI UBiDiLevel U_EXPORT2
ubidi_getLevelAt(const UBiDi *pBiDi, UTextOffset charIndex) {
/* return paraLevel if in the trailing WS run, otherwise the real level */
if(pBiDi==NULL || charIndex<0 || pBiDi->length<=charIndex) {
@ -226,11 +226,11 @@ ubidi_getLevelAt(const UBiDi *pBiDi, UTextOffset charIndex) {
}
}
CAPI const UBiDiLevel * U_EXPORT2
U_CAPI const UBiDiLevel * U_EXPORT2
ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode) {
UTextOffset start, length;
if(pErrorCode==NULL || FAILURE(*pErrorCode)) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
return NULL;
} else if(pBiDi==NULL || (length=pBiDi->length)<=0) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
@ -268,7 +268,7 @@ ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode) {
}
}
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_getLogicalRun(const UBiDi *pBiDi, UTextOffset logicalStart,
UTextOffset *pLogicalLimit, UBiDiLevel *pLevel) {
UTextOffset length;
@ -336,9 +336,9 @@ setTrailingWSStart(UBiDi *pBiDi) {
/* runs API functions ------------------------------------------------------- */
CAPI UTextOffset U_EXPORT2
U_CAPI UTextOffset U_EXPORT2
ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode) {
if(pErrorCode==NULL || FAILURE(*pErrorCode)) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
return -1;
} else if(pBiDi==NULL || pBiDi->runCount<0 && !getRuns(pBiDi)) {
*pErrorCode=U_MEMORY_ALLOCATION_ERROR;
@ -348,7 +348,7 @@ ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode) {
}
}
CAPI UBiDiDirection U_EXPORT2
U_CAPI UBiDiDirection U_EXPORT2
ubidi_getVisualRun(UBiDi *pBiDi, UTextOffset runIndex,
UTextOffset *pLogicalStart, UTextOffset *pLength) {
if( pBiDi==NULL || runIndex<0 ||
@ -659,7 +659,7 @@ reorderLine(UBiDi *pBiDi, UBiDiLevel minLevel, UBiDiLevel maxLevel) {
/* reorder a line based on a levels array (L2) ------------------------------ */
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_reorderLogical(const UBiDiLevel *levels, UTextOffset length, UTextOffset *indexMap) {
UTextOffset start, limit, sumOfSosEos;
UBiDiLevel minLevel, maxLevel;
@ -722,7 +722,7 @@ ubidi_reorderLogical(const UBiDiLevel *levels, UTextOffset length, UTextOffset *
} while(--maxLevel>=minLevel);
}
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_reorderVisual(const UBiDiLevel *levels, UTextOffset length, UTextOffset *indexMap) {
UTextOffset start, end, limit, temp;
UBiDiLevel minLevel, maxLevel;
@ -822,9 +822,9 @@ prepareReorder(const UBiDiLevel *levels, UTextOffset length,
/* API functions for logical<->visual mapping ------------------------------- */
CAPI UTextOffset U_EXPORT2
U_CAPI UTextOffset U_EXPORT2
ubidi_getVisualIndex(UBiDi *pBiDi, UTextOffset logicalIndex, UErrorCode *pErrorCode) {
if(pErrorCode==NULL || FAILURE(*pErrorCode)) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
return 0;
} else if(pBiDi==NULL) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
@ -867,9 +867,9 @@ ubidi_getVisualIndex(UBiDi *pBiDi, UTextOffset logicalIndex, UErrorCode *pErrorC
}
}
CAPI UTextOffset U_EXPORT2
U_CAPI UTextOffset U_EXPORT2
ubidi_getLogicalIndex(UBiDi *pBiDi, UTextOffset visualIndex, UErrorCode *pErrorCode) {
if(pErrorCode==NULL || FAILURE(*pErrorCode)) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
return 0;
} else if(pBiDi==NULL) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
@ -929,7 +929,7 @@ ubidi_getLogicalIndex(UBiDi *pBiDi, UTextOffset visualIndex, UErrorCode *pErrorC
}
}
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_getLogicalMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode) {
UBiDiLevel *levels;
@ -943,7 +943,7 @@ ubidi_getLogicalMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode)
}
}
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_getVisualMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode) {
/* ubidi_countRuns() checks all of its and our arguments */
if(ubidi_countRuns(pBiDi, pErrorCode)<=0) {
@ -975,7 +975,7 @@ ubidi_getVisualMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode)
}
}
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset length) {
if(srcMap!=NULL && destMap!=NULL) {
srcMap+=length;

19
icu4c/source/common/uchar.c
View file

@ -32,6 +32,25 @@
#include <stdio.h>
struct UCharDigitPair{
uint16_t fUnicode;
int8_t fValue;
};
typedef struct UCharDigitPair UCharDigitPair;
struct BlockScriptMap {
UChar fFirstCode;
UChar fLastCode;
};
typedef struct BlockScriptMap BlockScriptMap;
static bool_t tablesCreated=FALSE;
static bool_t ulTablesCreated=FALSE;
static bool_t dirTablesCreated=FALSE;
static void createTables(void);
static void createUlTables(void);
static void createDirTables(void);
char* _ucdVersion=NULL;
const UChar MIN_VALUE = 0x0000;

81
icu4c/source/common/uchar.h
View file

@ -33,39 +33,6 @@
/*===========================================================================*/
#define UNICODE_VERSION "3.0.0.beta"
/**
* The Unicode C API allows you to query the properties associated with individual
* Unicode character values.
* <p>
* The Unicode character information, provided implicitly by the
* Unicode character encoding standard, includes information about the script
* (for example, symbols or control characters) to which the character belongs,
* as well as semantic information such as whether a character is a digit or
* uppercase, lowercase, or uncased.
* <P>
*/
struct UCharDigitPair{
uint16_t fUnicode;
int8_t fValue;
};
typedef struct UCharDigitPair UCharDigitPair;
struct BlockScriptMap {
UChar fFirstCode;
UChar fLastCode;
};
typedef struct BlockScriptMap BlockScriptMap;
static bool_t tablesCreated=FALSE;
static bool_t ulTablesCreated=FALSE;
static bool_t dirTablesCreated=FALSE;
static void createTables(void);
static void createUlTables(void);
static void createDirTables(void);
/**
* The Unicode C API allows you to query the properties associated with individual
* Unicode character values.
@ -290,7 +257,7 @@ typedef enum UCellWidth UCellWidth;
* @see uistitle()
* @see uislower()
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_islower(UChar c);
/**
@ -303,7 +270,7 @@ u_islower(UChar c);
* @see uistitle
* @see utolower()
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isupper(UChar c);
/**
@ -316,7 +283,7 @@ u_isupper(UChar c);
* @see uislower()
* @see utotitle()
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_istitle(UChar c);
/**
@ -326,7 +293,7 @@ u_istitle(UChar c);
* @param ch the character to be tested
* @return true if the character is a digit; false otherwise.
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isdigit(UChar c);
/**
@ -343,7 +310,7 @@ u_isdigit(UChar c);
* @see uislower()
* @see uistitle()
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isdefined(UChar c);
/**
@ -356,7 +323,7 @@ u_isdefined(UChar c);
* @see uisdigit()
* @see uisalnum()
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isalpha(UChar c);
/**
@ -365,7 +332,7 @@ u_isalpha(UChar c);
* @param ch the character to be tested
* @return true if the character is a space character; false otherwise.
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isspace(UChar c);
/**
@ -376,7 +343,7 @@ u_isspace(UChar c);
*
* @see uisprint()
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_iscntrl(UChar c);
@ -389,7 +356,7 @@ u_iscntrl(UChar c);
*
* @see uiscntrl()
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isprint(UChar c);
/**
@ -402,7 +369,7 @@ u_isprint(UChar c);
* @see uisalpha()
* @see uisdigit()
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isbase(UChar c);
/**
* Returns the linguistic direction property of a character.
@ -412,7 +379,7 @@ u_isbase(UChar c);
* property.
* @see UCharDirection
*/
CAPI UCharDirection U_EXPORT2
U_CAPI UCharDirection U_EXPORT2
u_charDirection(UChar c);
/**
@ -465,7 +432,7 @@ u_charDirection(UChar c);
* consonant. The results may be slightly off with Korean text following different
* conventions.
*/
CAPI uint16_t U_EXPORT2
U_CAPI uint16_t U_EXPORT2
u_charCellWidth(UChar c);
/**
@ -475,7 +442,7 @@ u_charCellWidth(UChar c);
* @return a value of type int, the character category.
* @see UCharCategory
*/
CAPI int8_t U_EXPORT2
U_CAPI int8_t U_EXPORT2
u_charType(UChar c);
/**
@ -484,7 +451,7 @@ u_charType(UChar c);
* @return the numeric value of ch in decimal radix. This method returns
* -1 if ch is not a valid digit character.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
u_charDigitValue(UChar c);
/**
@ -492,7 +459,7 @@ u_charDigitValue(UChar c);
* Returns the script associated with a character.
* @see #UCharScript
*/
CAPI UCharScript U_EXPORT2
U_CAPI UCharScript U_EXPORT2
u_charScript(UChar ch);
/**
@ -510,7 +477,7 @@ u_charScript(UChar ch);
* @see u_isalpha
* @see u_isIDPart
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isIDStart(UChar c);
/**
* A convenience method for determining if a Unicode character
@ -535,7 +502,7 @@ u_isIDStart(UChar c);
* @see u_isIDIgnorable
* @see u_isIDStart
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isIDPart(UChar c);
/**
* A convenience method for determining if a Unicode character
@ -560,7 +527,7 @@ u_isIDPart(UChar c);
* FALSE otherwise.
* @see u_isIDPart
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isIDIgnorable(UChar c);
/**
* A convenience method for determining if a Unicode character
@ -581,7 +548,7 @@ u_isIDIgnorable(UChar c);
* @see u_isalpha
* @see u_isIDStart
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isJavaIDStart(UChar c);
/**
* A convenience method for determining if a Unicode character
@ -611,7 +578,7 @@ u_isJavaIDStart(UChar c);
* @see u_isIDPart
*/
CAPI bool_t U_EXPORT2
U_CAPI bool_t U_EXPORT2
u_isJavaIDPart(UChar c);
/**
@ -635,7 +602,7 @@ u_isJavaIDPart(UChar c);
* @return the lowercase equivalent of the character, if any;
* otherwise the character itself.
*/
CAPI UChar U_EXPORT2
U_CAPI UChar U_EXPORT2
u_tolower(UChar c);
/**
@ -652,7 +619,7 @@ u_tolower(UChar c);
* @return the uppercase equivalent of the character, if any;
* otherwise the character itself.
*/
CAPI UChar U_EXPORT2
U_CAPI UChar U_EXPORT2
u_toupper(UChar c);
/**
* The given character is mapped to its titlecase equivalent according to Unicode
@ -667,7 +634,7 @@ u_toupper(UChar c);
* @return the titlecase equivalent of the character, if any;
* otherwise the character itself.
*/
CAPI UChar U_EXPORT2
U_CAPI UChar U_EXPORT2
u_totitle(UChar c);
/**
@ -675,7 +642,7 @@ u_totitle(UChar c);
*The function is used to get the Unicode standard Version that is used
*@return the Unicode stabdard Version number
*/
CAPI const char* U_EXPORT2
U_CAPI const char* U_EXPORT2
u_getVersion(void);
#endif /*_UCHAR*/

33
icu4c/source/common/ucmp16.h
View file

@ -76,12 +76,11 @@
* @see CompactIntArray
* @see CompactCharArray
* @see CompactStringArray
* @version $Revision: 1.2 $ 8/25/98
* @version $Revision: 1.3 $ 8/25/98
* @author Helena Shih
*/
typedef struct
{
typedef struct CompactShortArray {
int16_t* fArray;
uint16_t* fIndex;
int32_t* fHashes;
@ -94,14 +93,14 @@ typedef struct
} CompactShortArray;
CAPI int32_t U_EXPORT2 ucmp16_getkUnicodeCount(void);
CAPI int32_t U_EXPORT2 ucmp16_getkBlockCount(void);
U_CAPI int32_t U_EXPORT2 ucmp16_getkUnicodeCount(void);
U_CAPI int32_t U_EXPORT2 ucmp16_getkBlockCount(void);
/**
* Construct an empty CompactShortArray.
* @param defaultValue the default value for all characters not explicitly in the array
*/
CAPI CompactShortArray* U_EXPORT2 ucmp16_open(int16_t defaultValue);
U_CAPI CompactShortArray* U_EXPORT2 ucmp16_open(int16_t defaultValue);
/**
* Construct a CompactShortArray from a pre-computed index and values array. The values
@ -115,24 +114,24 @@ CAPI CompactShortArray* U_EXPORT2 ucmp16_open(int16_t defaultValue);
* @param defaultValue the default value for all characters not explicitly in the array
* @see compact
*/
CAPI CompactShortArray* U_EXPORT2 ucmp16_openAdopt(uint16_t *indexArray,
U_CAPI CompactShortArray* U_EXPORT2 ucmp16_openAdopt(uint16_t *indexArray,
int16_t *newValues,
int32_t count,
int16_t defaultValue );
CAPI CompactShortArray* U_EXPORT2 ucmp16_openAdoptWithBlockShift(uint16_t *indexArray,
U_CAPI CompactShortArray* U_EXPORT2 ucmp16_openAdoptWithBlockShift(uint16_t *indexArray,
int16_t *newValues,
int32_t count,
int16_t defaultValue,
int32_t blockShift);
CAPI void U_EXPORT2 ucmp16_close(CompactShortArray* array);
U_CAPI void U_EXPORT2 ucmp16_close(CompactShortArray* array);
/**
* Returns TRUE if the creation of the compact array fails.
*/
CAPI bool_t U_EXPORT2 ucmp16_isBogus(const CompactShortArray* array);
U_CAPI bool_t U_EXPORT2 ucmp16_isBogus(const CompactShortArray* array);
/**
*
@ -153,7 +152,7 @@ CAPI bool_t U_EXPORT2 ucmp16_isBogus(const CompactShortArray* array);
* @param index the character to set the mapped value with
* @param value the new mapped value
*/
CAPI void U_EXPORT2 ucmp16_set(CompactShortArray *array,
U_CAPI void U_EXPORT2 ucmp16_set(CompactShortArray *array,
UChar index,
int16_t value);
@ -165,7 +164,7 @@ CAPI void U_EXPORT2 ucmp16_set(CompactShortArray *array,
* @param end the ending offset of the range
* @param value the new mapped value
*/
CAPI void U_EXPORT2 ucmp16_setRange(CompactShortArray* array,
U_CAPI void U_EXPORT2 ucmp16_setRange(CompactShortArray* array,
UChar start,
UChar end,
int16_t value);
@ -177,33 +176,33 @@ CAPI void U_EXPORT2 ucmp16_setRange(CompactShortArray* array,
* want better compaction, you can do your own compaction and use
* the constructor that lets you pass in the pre-computed arrays.
*/
CAPI void U_EXPORT2 ucmp16_compact(CompactShortArray* array);
U_CAPI void U_EXPORT2 ucmp16_compact(CompactShortArray* array);
/**
* Get the default value.
*/
CAPI int16_t U_EXPORT2 ucmp16_getDefaultValue(const CompactShortArray* array);
U_CAPI int16_t U_EXPORT2 ucmp16_getDefaultValue(const CompactShortArray* array);
/**
*
* Get the number of elements in the value array.
* @return the number of elements in the value array.
*/
CAPI uint32_t U_EXPORT2 ucmp16_getCount(const CompactShortArray* array);
U_CAPI uint32_t U_EXPORT2 ucmp16_getCount(const CompactShortArray* array);
/**
*
* Get the address of the value array.
* @return the address of the value array
*/
CAPI const int16_t* U_EXPORT2 ucmp16_getArray(const CompactShortArray* array);
U_CAPI const int16_t* U_EXPORT2 ucmp16_getArray(const CompactShortArray* array);
/**
*
* Get the address of the index array.
* @return the address of the index array
*/
CAPI const uint16_t* U_EXPORT2 ucmp16_getIndex(const CompactShortArray* array);
U_CAPI const uint16_t* U_EXPORT2 ucmp16_getIndex(const CompactShortArray* array);

36
icu4c/source/common/ucmp32.h
View file

@ -75,7 +75,7 @@
* @see CompactIntArray
* @see CompactCharArray
* @see CompactStringArray
* @version $Revision: 1.2 $ 8/25/98
* @version $Revision: 1.3 $ 8/25/98
* @author Helena Shih
*/
/*====================================*/
@ -93,8 +93,8 @@ typedef struct{
bool_t fBogus;
} CompactIntArray;
CAPI int32_t U_EXPORT2 ucmp32_getkUnicodeCount(void);
CAPI int32_t U_EXPORT2 ucmp32_getkBlockCount(void);
U_CAPI int32_t U_EXPORT2 ucmp32_getkUnicodeCount(void);
U_CAPI int32_t U_EXPORT2 ucmp32_getkBlockCount(void);
/**
@ -102,7 +102,7 @@ typedef struct{
* Construct an empty CompactIntArray.
* @param defaultValue the default value for all characters not explicitly in the array
*/
CAPI CompactIntArray* U_EXPORT2 ucmp32_open(int32_t defaultValue);
U_CAPI CompactIntArray* U_EXPORT2 ucmp32_open(int32_t defaultValue);
/**
* Construct a CompactIntArray from a pre-computed index and values array. The values
@ -115,25 +115,25 @@ CAPI CompactIntArray* U_EXPORT2 ucmp32_open(int32_t defaultValue);
* @param count the number of entries in the value array
* @see compact
*/
CAPI CompactIntArray* U_EXPORT2 ucmp32_openAdopt(uint16_t *indexArray,
U_CAPI CompactIntArray* U_EXPORT2 ucmp32_openAdopt(uint16_t *indexArray,
int32_t *newValues,
int32_t count);
CAPI void U_EXPORT2 ucmp32_close(CompactIntArray* array);
U_CAPI void U_EXPORT2 ucmp32_close(CompactIntArray* array);
/**
* Returns TRUE if the creation of the compact array fails.
*/
CAPI bool_t U_EXPORT2 ucmp32_isBogus(const CompactIntArray* array);
U_CAPI bool_t U_EXPORT2 ucmp32_isBogus(const CompactIntArray* array);
/**
*
* Get the mapped value of a Unicode character.
* @param index the character to get the mapped value with
* @return the mapped value of the given character
*/
CAPI int32_t U_EXPORT2 ucmp32_get(CompactIntArray* array, uint16_t index);
CAPI uint32_t U_EXPORT2 ucmp32_getu(CompactIntArray* array, uint16_t index);
U_CAPI int32_t U_EXPORT2 ucmp32_get(CompactIntArray* array, uint16_t index);
U_CAPI uint32_t U_EXPORT2 ucmp32_getu(CompactIntArray* array, uint16_t index);
/**
* Set a new value for a Unicode character.
@ -141,7 +141,7 @@ CAPI uint32_t U_EXPORT2 ucmp32_getu(CompactIntArray* array, uint16_t index);
* @param index the character to set the mapped value with
* @param value the new mapped value
*/
CAPI void U_EXPORT2 ucmp32_set(CompactIntArray *array,
U_CAPI void U_EXPORT2 ucmp32_set(CompactIntArray *array,
UChar index,
int32_t value);
@ -152,7 +152,7 @@ CAPI void U_EXPORT2 ucmp32_set(CompactIntArray *array,
* @param end the ending offset of the range
* @param value the new mapped value
*/
CAPI void U_EXPORT2 ucmp32_setRange(CompactIntArray* array,
U_CAPI void U_EXPORT2 ucmp32_setRange(CompactIntArray* array,
UChar start,
UChar end,
int32_t value);
@ -164,36 +164,36 @@ CAPI void U_EXPORT2 ucmp32_setRange(CompactIntArray* array,
* then using that will be faster than cycle = 1, and get almost the
* same compression.
*/
CAPI void U_EXPORT2 ucmp32_compact(CompactIntArray* array, int32_t cycle);
U_CAPI void U_EXPORT2 ucmp32_compact(CompactIntArray* array, int32_t cycle);
/**
* Expands the compacted array.
* Takes the array back to a 65536 element array
*/
CAPI void U_EXPORT2 ucmp32_expand(CompactIntArray* array);
U_CAPI void U_EXPORT2 ucmp32_expand(CompactIntArray* array);
/**
*
* Get the number of elements in the value array.
* @return the number of elements in the value array.
*/
CAPI uint32_t U_EXPORT2 ucmp32_getCount(const CompactIntArray* array);
U_CAPI uint32_t U_EXPORT2 ucmp32_getCount(const CompactIntArray* array);
/**
*
* Get the address of the value array.
* @return the address of the value array
*/
CAPI const int32_t* U_EXPORT2 ucmp32_getArray(const CompactIntArray* array);
U_CAPI const int32_t* U_EXPORT2 ucmp32_getArray(const CompactIntArray* array);
/**
*
* Get the address of the index array.
* @return the address of the index array
*/
CAPI const uint16_t* U_EXPORT2 ucmp32_getIndex(const CompactIntArray* array);
U_CAPI const uint16_t* U_EXPORT2 ucmp32_getIndex(const CompactIntArray* array);
CAPI void U_EXPORT2 ucmp32_streamIn( CompactIntArray* array, FileStream* is);
CAPI void U_EXPORT2 ucmp32_streamOut(CompactIntArray* array, FileStream* os);
U_CAPI void U_EXPORT2 ucmp32_streamIn( CompactIntArray* array, FileStream* is);
U_CAPI void U_EXPORT2 ucmp32_streamOut(CompactIntArray* array, FileStream* os);

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

@ -29,6 +29,7 @@
#include "ucnv_io.h"
#include "ucnv_err.h"
#include "ucnv_cnv.h"
#include "ucnv_imp.h"
#include "ucnv.h"
#include "cmemory.h"
#include "cstring.h"
@ -61,7 +62,7 @@ typedef UChar (*T_GetNextUCharFunction) (UConverter *,
const char *,
UErrorCode *);
static T_ToUnicodeFunction TO_UNICODE_FUNCTIONS[NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
static T_ToUnicodeFunction TO_UNICODE_FUNCTIONS[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
{
T_UConverter_toUnicode_SBCS,
@ -75,13 +76,13 @@ static T_ToUnicodeFunction TO_UNICODE_FUNCTIONS[NUMBER_OF_SUPPORTED_CONVERTER_TY
T_UConverter_toUnicode_ISO_2022
};
static T_ToUnicodeFunction TO_UNICODE_FUNCTIONS_OFFSETS_LOGIC[NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
static T_ToUnicodeFunction TO_UNICODE_FUNCTIONS_OFFSETS_LOGIC[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
{
NULL, /*SBCS*/
NULL, /*DBCS*/
NULL, /*UCNV_SBCS*/
NULL, /*UCNV_DBCS*/
T_UConverter_toUnicode_MBCS_OFFSETS_LOGIC,
NULL, /*LATIN_1*/
NULL, /*UCNV_LATIN_1*/
T_UConverter_toUnicode_UTF8_OFFSETS_LOGIC,
NULL, /*UTF16_BE*/
NULL, /*UTF16_LE*/
@ -89,13 +90,13 @@ static T_ToUnicodeFunction TO_UNICODE_FUNCTIONS_OFFSETS_LOGIC[NUMBER_OF_SUPPORTE
T_UConverter_toUnicode_ISO_2022_OFFSETS_LOGIC
};
static T_FromUnicodeFunction FROM_UNICODE_FUNCTIONS_OFFSETS_LOGIC[NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
static T_FromUnicodeFunction FROM_UNICODE_FUNCTIONS_OFFSETS_LOGIC[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
{
NULL, /*SBCS*/
NULL, /*DBCS*/
NULL, /*UCNV_SBCS*/
NULL, /*UCNV_DBCS*/
T_UConverter_fromUnicode_MBCS_OFFSETS_LOGIC,
NULL, /*LATIN_1*/
NULL, /*UCNV_LATIN_1*/
T_UConverter_fromUnicode_UTF8_OFFSETS_LOGIC,
NULL, /*UTF16_BE*/
NULL, /*UTF16_LE*/
@ -103,7 +104,7 @@ static T_FromUnicodeFunction FROM_UNICODE_FUNCTIONS_OFFSETS_LOGIC[NUMBER_OF_SUPP
T_UConverter_fromUnicode_ISO_2022_OFFSETS_LOGIC
};
static T_FromUnicodeFunction FROM_UNICODE_FUNCTIONS[NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
static T_FromUnicodeFunction FROM_UNICODE_FUNCTIONS[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
{
T_UConverter_fromUnicode_SBCS,
T_UConverter_fromUnicode_DBCS,
@ -116,7 +117,7 @@ static T_FromUnicodeFunction FROM_UNICODE_FUNCTIONS[NUMBER_OF_SUPPORTED_CONVERTE
T_UConverter_fromUnicode_ISO_2022
};
static T_GetNextUCharFunction GET_NEXT_UChar_FUNCTIONS[NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
static T_GetNextUCharFunction GET_NEXT_UChar_FUNCTIONS[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES] =
{
T_UConverter_getNextUChar_SBCS,
T_UConverter_getNextUChar_DBCS,
@ -169,7 +170,7 @@ void ucnv_setDefaultName (const char *converterName)
UConverter* ucnv_open (const char *name,
UErrorCode * err)
{
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
/*In case "name" is NULL we want to open the default converter */
@ -183,13 +184,13 @@ UConverter* ucnv_open (const char *name,
UConverter* ucnv_openU (const UChar * name,
UErrorCode * err)
{
char asciiName[MAX_CONVERTER_NAME_LENGTH];
char asciiName[UCNV_MAX_CONVERTER_NAME_LENGTH];
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
if (name == NULL)
return ucnv_open (NULL, err);
if (u_strlen (name) > MAX_CONVERTER_NAME_LENGTH)
if (u_strlen (name) > UCNV_MAX_CONVERTER_NAME_LENGTH)
{
*err = U_ILLEGAL_ARGUMENT_ERROR;
return NULL;
@ -200,12 +201,12 @@ UConverter* ucnv_openU (const UChar * name,
/*Assumes a $platform-#codepage.$CONVERTER_FILE_EXTENSION scheme and calls
*through createConverter*/
UConverter* ucnv_openCCSID (int32_t codepage,
UCNV_PLATFORM platform,
UConverterPlatform platform,
UErrorCode * err)
{
char myName[MAX_CONVERTER_NAME_LENGTH];
char myName[UCNV_MAX_CONVERTER_NAME_LENGTH];
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
copyPlatformString (myName, platform);
@ -225,10 +226,10 @@ void ucnv_close (UConverter * converter)
if (converter == NULL)
return;
if ((converter->sharedData->conversionType == ISO_2022) &&
if ((converter->sharedData->conversionType == UCNV_ISO_2022) &&
(converter->mode == UCNV_SO))
{
ucnv_close (((UCNV_Data2022 *) (converter->extraInfo))->currentConverter);
ucnv_close (((UConverterDataISO2022 *) (converter->extraInfo))->currentConverter);
icu_free (converter->extraInfo);
}
@ -306,7 +307,7 @@ void ucnv_getSubstChars (const UConverter * converter,
int8_t * len,
UErrorCode * err)
{
if (FAILURE (*err))
if (U_FAILURE (*err))
return;
if (*len < converter->subCharLen) /*not enough space in subChars */
@ -328,7 +329,7 @@ void ucnv_setSubstChars (UConverter * converter,
{
uint8_t x = 0;
if (FAILURE (*err))
if (U_FAILURE (*err))
return;
/*Makes sure that the subChar is within the codepages char length boundaries */
@ -354,12 +355,12 @@ int32_t ucnv_getDisplayName (const UConverter * converter,
int32_t displayNameCapacity,
UErrorCode * err)
{
UChar stringToWriteBuffer[MAX_CONVERTER_NAME_LENGTH];
UChar stringToWriteBuffer[UCNV_MAX_CONVERTER_NAME_LENGTH];
UChar const *stringToWrite;
int32_t stringToWriteLength;
UResourceBundle *rb = NULL;
if (FAILURE (*err))
if (U_FAILURE (*err))
return 0;
/*create an RB, init the fill-in string, gets it from the RB */
@ -372,7 +373,7 @@ int32_t ucnv_getDisplayName (const UConverter * converter,
if (rb)
ures_close (rb);
if (SUCCESS (*err))
if (U_SUCCESS (*err))
stringToWriteLength = u_strlen (stringToWrite);
else
{
@ -429,16 +430,16 @@ void ucnv_reset (UConverter * converter)
converter->fromUnicodeStatus = 0;
converter->UCharErrorBufferLength = 0;
converter->charErrorBufferLength = 0;
if ((converter->sharedData->conversionType == ISO_2022) &&
if ((converter->sharedData->conversionType == UCNV_ISO_2022) &&
(converter->mode == UCNV_SO))
{
converter->charErrorBufferLength = 3;
converter->charErrorBuffer[0] = 0x1b;
converter->charErrorBuffer[1] = 0x25;
converter->charErrorBuffer[2] = 0x42;
ucnv_close (((UCNV_Data2022 *) (converter->extraInfo))->currentConverter);
((UCNV_Data2022 *) (converter->extraInfo))->currentConverter = NULL;
((UCNV_Data2022 *) (converter->extraInfo))->escSeq2022Length = 0;
ucnv_close (((UConverterDataISO2022 *) (converter->extraInfo))->currentConverter);
((UConverterDataISO2022 *) (converter->extraInfo))->currentConverter = NULL;
((UConverterDataISO2022 *) (converter->extraInfo))->escSeq2022Length = 0;
}
converter->mode = UCNV_SI;
@ -459,7 +460,7 @@ int8_t ucnv_getMinCharSize (const UConverter * converter)
const char* ucnv_getName (const UConverter * converter, UErrorCode * err)
{
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
return converter->sharedData->name;
@ -468,39 +469,39 @@ const char* ucnv_getName (const UConverter * converter, UErrorCode * err)
int32_t ucnv_getCCSID (const UConverter * converter,
UErrorCode * err)
{
if (FAILURE (*err))
if (U_FAILURE (*err))
return -1;
return converter->sharedData->codepage;
}
UCNV_PLATFORM ucnv_getPlatform (const UConverter * converter,
UConverterPlatform ucnv_getPlatform (const UConverter * converter,
UErrorCode * err)
{
if (FAILURE (*err))
return UNKNOWN;
if (U_FAILURE (*err))
return UCNV_UNKNOWN;
return converter->sharedData->platform;
}
UCNV_ToUCallBack ucnv_getToUCallBack (const UConverter * converter)
UConverterToUCallback ucnv_getToUCallBack (const UConverter * converter)
{
return converter->fromCharErrorBehaviour;
}
UCNV_FromUCallBack ucnv_getFromUCallBack (const UConverter * converter)
UConverterFromUCallback ucnv_getFromUCallBack (const UConverter * converter)
{
return converter->fromUCharErrorBehaviour;
}
UCNV_ToUCallBack ucnv_setToUCallBack (UConverter * converter,
UCNV_ToUCallBack action,
UConverterToUCallback ucnv_setToUCallBack (UConverter * converter,
UConverterToUCallback action,
UErrorCode * err)
{
UCNV_ToUCallBack myReturn = NULL;
UConverterToUCallback myReturn = NULL;
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
myReturn = converter->fromCharErrorBehaviour;
converter->fromCharErrorBehaviour = action;
@ -508,13 +509,13 @@ UCNV_ToUCallBack ucnv_setToUCallBack (UConverter * converter,
return myReturn;
}
UCNV_FromUCallBack ucnv_setFromUCallBack (UConverter * converter,
UCNV_FromUCallBack action,
UConverterFromUCallback ucnv_setFromUCallBack (UConverter * converter,
UConverterFromUCallback action,
UErrorCode * err)
{
UCNV_FromUCallBack myReturn = NULL;
UConverterFromUCallback myReturn = NULL;
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
myReturn = converter->fromUCharErrorBehaviour;
converter->fromUCharErrorBehaviour = action;
@ -531,11 +532,11 @@ void ucnv_fromUnicode (UConverter * _this,
bool_t flush,
UErrorCode * err)
{
UCNV_TYPE myConvType;
UConverterType myConvType;
/*
* Check parameters in for all conversions
*/
if (FAILURE (*err)) return;
if (U_FAILURE (*err)) return;
if ((_this == NULL) || ((char *) targetLimit < *target) || (sourceLimit < *source))
{
*err = U_ILLEGAL_ARGUMENT_ERROR;
@ -558,7 +559,7 @@ void ucnv_fromUnicode (UConverter * _this,
offsets?&offsets:NULL,
err);
*target += myTargetIndex;
if (FAILURE (*err)) return;
if (U_FAILURE (*err)) return;
}
myConvType = _this->sharedData->conversionType;
@ -568,12 +569,12 @@ void ucnv_fromUnicode (UConverter * _this,
int32_t i;
switch (myConvType)
{
case LATIN_1: case SBCS :
case UCNV_LATIN_1: case UCNV_SBCS :
{
for (i=0; i<targetSize; i++) offsets[i] = i;
break;
}
case UTF16_LittleEndian: case UTF16_BigEndian: case DBCS:
case UCNV_UTF16_LittleEndian: case UCNV_UTF16_BigEndian: case UCNV_DBCS:
{
--targetSize;
for (i=0; i<targetSize; i+=2)
@ -625,8 +626,8 @@ void ucnv_toUnicode (UConverter * _this,
/*
* Check parameters in for all conversions
*/
UCNV_TYPE myConvType;
if (FAILURE (*err)) return;
UConverterType myConvType;
if (U_FAILURE (*err)) return;
if ((_this == NULL) || ((UChar *) targetLimit < *target) || (sourceLimit < *source))
{
*err = U_ILLEGAL_ARGUMENT_ERROR;
@ -649,7 +650,7 @@ void ucnv_toUnicode (UConverter * _this,
offsets?&offsets:NULL,
err);
*target += myTargetIndex;
if (FAILURE (*err))
if (U_FAILURE (*err))
return;
}
@ -660,12 +661,12 @@ void ucnv_toUnicode (UConverter * _this,
switch (myConvType)
{
case LATIN_1: case SBCS :
case UCNV_LATIN_1: case UCNV_SBCS :
{
for (i=0; i<targetSize; i++) offsets[i] = i;
break;
}
case UTF16_LittleEndian: case UTF16_BigEndian: case DBCS:
case UCNV_UTF16_LittleEndian: case UCNV_UTF16_BigEndian: case UCNV_DBCS:
{
for (i=0; i<targetSize; i++)
{
@ -715,7 +716,7 @@ int32_t ucnv_fromUChars (const UConverter * converter,
char *myTarget = target;
int32_t targetCapacity = 0;
if (FAILURE (*err))
if (U_FAILURE (*err))
return 0;
if ((converter == NULL) || (targetSize < 0))
@ -796,7 +797,7 @@ int32_t ucnv_fromUChars (const UConverter * converter,
/*We will set the erro code to U_BUFFER_OVERFLOW_ERROR only if
*nothing graver happened in the previous loop*/
(targetCapacity)--;
if (SUCCESS (*err))
if (U_SUCCESS (*err))
*err = U_BUFFER_OVERFLOW_ERROR;
}
@ -816,7 +817,7 @@ int32_t ucnv_toUChars (const UConverter * converter,
UChar *myTarget = target;
int32_t targetCapacity;
if (FAILURE (*err))
if (U_FAILURE (*err))
return 0;
if ((converter == NULL) || (targetSize < 0) || (sourceSize < 0))
@ -904,7 +905,7 @@ int32_t ucnv_toUChars (const UConverter * converter,
targetCapacity += target2_alias - target2 + 1;
}
(targetCapacity)--; /*adjust for last one */
if (SUCCESS (*err))
if (U_SUCCESS (*err))
*err = U_BUFFER_OVERFLOW_ERROR;
}
@ -972,7 +973,7 @@ T_UConverter_fromCodepageToCodepage (UConverter * outConverter,
UChar const *out_chunk_alias2;
if (FAILURE (*err)) return;
if (U_FAILURE (*err)) return;
/*loops until the input buffer is completely consumed
@ -980,7 +981,7 @@ T_UConverter_fromCodepageToCodepage (UConverter * outConverter,
*first we convert from inConverter codepage to Unicode
*then from Unicode to outConverter codepage
*/
while ((*source != sourceLimit) && SUCCESS (*err))
while ((*source != sourceLimit) && U_SUCCESS (*err))
{
out_chunk_alias = out_chunk;
ucnv_toUnicode (inConverter,
@ -996,12 +997,12 @@ T_UConverter_fromCodepageToCodepage (UConverter * outConverter,
*we will require at least another loop (it's a recoverable error)
*/
if (SUCCESS (*err) || (*err == U_INDEX_OUTOFBOUNDS_ERROR))
if (U_SUCCESS (*err) || (*err == U_INDEX_OUTOFBOUNDS_ERROR))
{
*err = U_ZERO_ERROR;
out_chunk_alias2 = out_chunk;
while ((out_chunk_alias2 != out_chunk_alias) && SUCCESS (*err))
while ((out_chunk_alias2 != out_chunk_alias) && U_SUCCESS (*err))
{
ucnv_fromUnicode (outConverter,
target,
@ -1037,7 +1038,7 @@ int32_t ucnv_convert(const char *toConverterName,
char *myTarget = target;
int32_t targetCapacity = 0;
if (FAILURE (*err))
if (U_FAILURE (*err))
return 0;
if ((targetSize < 0) || (sourceSize < 0))
@ -1057,9 +1058,9 @@ int32_t ucnv_convert(const char *toConverterName,
/*create the converters */
inConverter = ucnv_open (fromConverterName, err);
if (FAILURE (*err)) return 0;
if (U_FAILURE (*err)) return 0;
outConverter = ucnv_open (toConverterName, err);
if (FAILURE (*err))
if (U_FAILURE (*err))
{
ucnv_close (inConverter);
return 0;
@ -1120,7 +1121,7 @@ int32_t ucnv_convert(const char *toConverterName,
/*We will set the erro code to U_BUFFER_OVERFLOW_ERROR only if
*nothing graver happened in the previous loop*/
(targetCapacity)--;
if (SUCCESS (*err))
if (U_SUCCESS (*err))
*err = U_BUFFER_OVERFLOW_ERROR;
}
@ -1130,7 +1131,7 @@ int32_t ucnv_convert(const char *toConverterName,
return targetCapacity;
}
UCNV_TYPE ucnv_getType(const UConverter* converter)
UConverterType ucnv_getType(const UConverter* converter)
{
return converter->sharedData->conversionType;
}
@ -1139,9 +1140,9 @@ void ucnv_getStarters(const UConverter* converter,
bool_t starters[256],
UErrorCode* err)
{
if (FAILURE(*err)) return;
/*Fire off an error if converter is not MBCS*/
if (converter->sharedData->conversionType != MBCS)
if (U_FAILURE(*err)) return;
/*Fire off an error if converter is not UCNV_MBCS*/
if (converter->sharedData->conversionType != UCNV_MBCS)
{
*err = U_ILLEGAL_ARGUMENT_ERROR;
return;

87
icu4c/source/common/ucnv.h
View file

@ -26,6 +26,23 @@
#include "ucnv_bld.h"
#include "ucnv_err.h"
typedef void (*UConverterToUCallback) (UConverter *,
UChar **,
const UChar *,
const char **,
const char *,
int32_t* offsets,
bool_t,
UErrorCode *);
typedef void (*UConverterFromUCallback) (UConverter *,
char **,
const char *,
const UChar **,
const UChar *,
int32_t* offsets,
bool_t,
UErrorCode *);
/**
@ -41,7 +58,7 @@
* @see ucnv_close
*/
CAPI
U_CAPI
UConverter* U_EXPORT2 ucnv_open (const char *converterName,
UErrorCode * err);
@ -58,7 +75,7 @@ UConverter* U_EXPORT2 ucnv_open (const char *converterName,
* @see ucnv_openCCSID
* @see ucnv_close
*/
CAPI UConverter* U_EXPORT2 ucnv_openU (const UChar * name,
U_CAPI UConverter* U_EXPORT2 ucnv_openU (const UChar * name,
UErrorCode * err);
@ -74,8 +91,8 @@ CAPI UConverter* U_EXPORT2 ucnv_openU (const UChar * name,
* @see ucnv_close
*/
CAPI UConverter* U_EXPORT2 ucnv_openCCSID (int32_t codepage,
UCNV_PLATFORM platform,
U_CAPI UConverter* U_EXPORT2 ucnv_openCCSID (int32_t codepage,
UConverterPlatform platform,
UErrorCode * err);
@ -86,7 +103,7 @@ CAPI UConverter* U_EXPORT2 ucnv_openCCSID (int32_t codepage,
* @see ucnv_openU
* @see ucnv_openCCSID
*/
CAPI void U_EXPORT2 ucnv_close (UConverter * converter);
U_CAPI void U_EXPORT2 ucnv_close (UConverter * converter);
@ -102,7 +119,7 @@ CAPI void U_EXPORT2 ucnv_close (UConverter * converter);
* @see ucnv_setSubstChars
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ucnv_getSubstChars (const UConverter * converter,
char *subChars,
int8_t * len,
@ -120,7 +137,7 @@ CAPI void U_EXPORT2
* @see ucnv_getSubstChars
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ucnv_setSubstChars (UConverter * converter,
const char *subChars,
int8_t len,
@ -139,7 +156,7 @@ CAPI void U_EXPORT2
* <TT>U_INDEX_OUTOFBOUNDS_ERROR</TT> will be returned.
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ucnv_getInvalidChars (const UConverter * converter,
char *errBytes,
int8_t * len,
@ -157,7 +174,7 @@ CAPI void U_EXPORT2
* <TT>U_INDEX_OUTOFBOUNDS_ERROR</TT> will be returned.
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ucnv_getInvalidUChars (const UConverter * converter,
char *errUChars,
int8_t * len,
@ -170,7 +187,7 @@ CAPI void U_EXPORT2
* @param converter the Unicode converter
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
ucnv_reset (UConverter * converter);
/**
@ -179,7 +196,7 @@ CAPI void U_EXPORT2
* @return the maximum number of bytes allowed by this particular converter
* @see ucnv_getMinCharSize
*/
CAPI int8_t U_EXPORT2
U_CAPI int8_t U_EXPORT2
ucnv_getMaxCharSize (const UConverter * converter);
@ -190,7 +207,7 @@ CAPI int8_t U_EXPORT2
* @return the minimum number of bytes allowed by this particular converter
* @see ucnv_getMaxCharSize
*/
CAPI int8_t U_EXPORT2
U_CAPI int8_t U_EXPORT2
ucnv_getMinCharSize (const UConverter * converter);
@ -206,7 +223,7 @@ CAPI int8_t U_EXPORT2
* @return displayNameLength number of UChar needed in displayName
* @see ucnv_getName
*/
CAPI
U_CAPI
int32_t U_EXPORT2 ucnv_getDisplayName (const UConverter * converter,
const char *displayLocale,
UChar * displayName,
@ -222,7 +239,7 @@ CAPI
* @return the internal name of the converter
* @see ucnv_getDisplayName
*/
CAPI
U_CAPI
const char * U_EXPORT2 ucnv_getName (const UConverter * converter, UErrorCode * err);
@ -237,7 +254,7 @@ CAPI
* @return If any error occurrs, -1 will be returned otherwise, the codepage number
* will be returned
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
ucnv_getCCSID (const UConverter * converter,
UErrorCode * err);
@ -249,7 +266,7 @@ CAPI int32_t U_EXPORT2
* the converter is <TT>NULL</TT> or if converter's data table is <TT>NULL</TT>.
* @return The codepage platform
*/
CAPI UCNV_PLATFORM U_EXPORT2
U_CAPI UConverterPlatform U_EXPORT2
ucnv_getPlatform (const UConverter * converter,
UErrorCode * err);
@ -259,7 +276,7 @@ CAPI UCNV_PLATFORM U_EXPORT2
* @param converter: a valid, opened converter
* @return the type of the converter
*/
CAPI UCNV_TYPE U_EXPORT2
U_CAPI UConverterType U_EXPORT2
ucnv_getType (const UConverter * converter);
/**
@ -274,7 +291,7 @@ ucnv_getType (const UConverter * converter);
* @param err: an array of size 256 to be filled in
* @see ucnv_getType
*/
CAPI void U_EXPORT2 ucnv_getStarters(const UConverter* converter,
U_CAPI void U_EXPORT2 ucnv_getStarters(const UConverter* converter,
bool_t starters[256],
UErrorCode* err);
@ -285,7 +302,7 @@ CAPI void U_EXPORT2 ucnv_getStarters(const UConverter* converter,
* @return a pointer to the callback function
* @see ucnv_setToUCallBack
*/
CAPI UCNV_ToUCallBack U_EXPORT2
U_CAPI UConverterToUCallback U_EXPORT2
ucnv_getToUCallBack (const UConverter * converter);
/**
@ -294,7 +311,7 @@ CAPI UCNV_ToUCallBack U_EXPORT2
* @return a pointer to the callback function
* @see ucnv_setFromUCallBack
*/
CAPI UCNV_FromUCallBack U_EXPORT2
U_CAPI UConverterFromUCallback U_EXPORT2
ucnv_getFromUCallBack (const UConverter * converter);
/**
@ -305,9 +322,9 @@ CAPI UCNV_FromUCallBack U_EXPORT2
* @return the previously assigned callback function pointer
* @see ucnv_getToUCallBack
*/
CAPI UCNV_ToUCallBack U_EXPORT2
U_CAPI UConverterToUCallback U_EXPORT2
ucnv_setToUCallBack (UConverter * converter,
UCNV_ToUCallBack action,
UConverterToUCallback action,
UErrorCode * err);
/**
@ -318,9 +335,9 @@ CAPI UCNV_ToUCallBack U_EXPORT2
* @return the previously assigned callback function pointer
* @see ucnv_getFromUCallBack
*/
CAPI UCNV_FromUCallBack U_EXPORT2
U_CAPI UConverterFromUCallback U_EXPORT2
ucnv_setFromUCallBack (UConverter * converter,
UCNV_FromUCallBack action,
UConverterFromUCallback action,
UErrorCode * err);
@ -356,7 +373,7 @@ CAPI UCNV_FromUCallBack U_EXPORT2
* @see ucnv_setToUCallBack
*/
CAPI
U_CAPI
void U_EXPORT2 ucnv_fromUnicode (UConverter * converter,
char **target,
const char *targetLimit,
@ -395,7 +412,7 @@ CAPI
* @see ucnv_setFromUCallBack
*/
CAPI
U_CAPI
void U_EXPORT2 ucnv_toUnicode (UConverter * converter,
UChar ** target,
const UChar * targetLimit,
@ -428,7 +445,7 @@ CAPI
* @see ucnv_fromUnicode
* @see ucnv_convert
*/
CAPI
U_CAPI
int32_t U_EXPORT2 ucnv_fromUChars (const UConverter * converter,
char *target,
int32_t targetCapacity,
@ -465,7 +482,7 @@ CAPI
* @see ucnv_toUnicode
* @see ucnv_convert
*/
CAPI
U_CAPI
int32_t U_EXPORT2 ucnv_toUChars (const UConverter * converter,
UChar * target,
int32_t targetCapacity,
@ -488,7 +505,7 @@ CAPI
*@see ucnv_toUChars
*@see ucnv_convert
*/
CAPI
U_CAPI
UChar U_EXPORT2 ucnv_getNextUChar (UConverter * converter,
const char **source,
const char *sourceLimit,
@ -513,7 +530,7 @@ CAPI
* @see ucnv_toUChars
* @see ucnv_getNextUChar
*/
CAPI
U_CAPI
int32_t U_EXPORT2 ucnv_convert (const char *toConverterName,
const char *fromConverterName,
char *target,
@ -527,7 +544,7 @@ CAPI
* Iterates through every cached converter and frees all the unused ones.
* @return the number of cached converters successfully deleted
*/
CAPI int32_t U_EXPORT2 ucnv_flushCache (void);
U_CAPI int32_t U_EXPORT2 ucnv_flushCache (void);
/**
@ -537,7 +554,7 @@ CAPI int32_t U_EXPORT2 ucnv_flushCache (void);
* @return a pointer a string (library owned), or <TT>NULL</TT> if the index is out of bounds.
* @see ucnv_countAvailable
*/
CAPI
U_CAPI
const char * U_EXPORT2 ucnv_getAvailableName (int32_t index);
/**
@ -545,14 +562,14 @@ CAPI
* @return the number of available converters
* @see ucnv_getAvailableName
*/
CAPI int32_t U_EXPORT2 ucnv_countAvailable (void);
U_CAPI int32_t U_EXPORT2 ucnv_countAvailable (void);
/**
* returns the current default converter name.
* @return returns the current default converter name
* @see ucnv_setDefaultName
*/
CAPI const char * U_EXPORT2 ucnv_getDefaultName (void);
U_CAPI const char * U_EXPORT2 ucnv_getDefaultName (void);
/**
* sets the current default converter name.
@ -561,7 +578,7 @@ CAPI const char * U_EXPORT2 ucnv_getDefaultName (void);
* @see ucnv_getDefaultName
*
*/
CAPI void U_EXPORT2 ucnv_setDefaultName (const char *name);
U_CAPI void U_EXPORT2 ucnv_setDefaultName (const char *name);
#endif

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

@ -25,14 +25,30 @@
#include "ucmp8.h"
#include "ucnv_bld.h"
#include "ucnv_err.h"
#include "ucnv_imp.h"
#include "ucnv.h"
#include "umutex.h"
#include "cstring.h"
#include "cmemory.h"
#include "filestrm.h"
/*Array used to generate ALGORITHMIC_CONVERTERS_HASHTABLE
*should ALWAYS BE EMPTY STRING TERMINATED.
*/
static const char *algorithmicConverterNames[] = {
"LATIN_1",
"UTF8",
"UTF16_BigEndian",
"UTF16_LittleEndian",
"ISO_2022",
"JIS",
"EUC",
"GB",
"ISO_2022",
""
};
/*Takes an alias name gets an actual converter file name
*goes to disk and opens it.
*allocates the memory and returns a new UConverter object
*/
@ -49,13 +65,13 @@ static CompactShortArray *createCompactShortArrayFromFile (FileStream * infile,
*a platform type and a codepage number
*assuming the following
*codepage name = $PLATFORM-#CODEPAGE
*e.g. ibm-949 = platform type = IBM and codepage # = 949
*e.g. ibm-949 = platform type = UCNV_IBM and codepage # = 949
*the functions below implement that
*/
static UCNV_PLATFORM getPlatformFromName (char *name);
static UConverterPlatform getPlatformFromName (char *name);
static int32_t getCodepageNumberFromName (char *name);
static UCNV_TYPE getAlgorithmicTypeFromName (const char *realName);
static UConverterType getAlgorithmicTypeFromName (const char *realName);
/*these functions initialize the lightweight mutable part of the
@ -85,7 +101,7 @@ CompactShortArray* createCompactShortArrayFromFile (FileStream * infile, UError
int32_t myIndexCount = 0;
int32_t myBlockShift = 0;
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
/*reads in the lengths of the 2 serialized array */
@ -140,7 +156,7 @@ CompactByteArray* createCompactByteArrayFromFile (FileStream * infile,
int32_t myValuesCount = 0;
int32_t myIndexCount = 0;
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
/*reads in the lengths of the 2 serialized array */
@ -194,8 +210,8 @@ UConverter* createConverterFromFile (const char *fileName, UErrorCode * err)
int32_t myCheck;
FileStream *infile = NULL;
int8_t errorLevel = 0;
char throwAway[COPYRIGHT_STRING_LENGTH];
if (FAILURE (*err))
char throwAway[UCNV_COPYRIGHT_STRING_LENGTH];
if (U_FAILURE (*err))
return NULL;
infile = openConverterFile (fileName);
@ -205,9 +221,9 @@ UConverter* createConverterFromFile (const char *fileName, UErrorCode * err)
return NULL;
}
/*Reads the FILE_CHECK_MARKER to assess the integrity of the file */
/*Reads the UCNV_FILE_CHECK_MARKER to assess the integrity of the file */
T_FileStream_read (infile, &myCheck, sizeof (int32_t));
if (myCheck != FILE_CHECK_MARKER)
if (myCheck != UCNV_FILE_CHECK_MARKER)
{
T_FileStream_close (infile);
*err = U_INVALID_TABLE_FILE;
@ -215,7 +231,7 @@ UConverter* createConverterFromFile (const char *fileName, UErrorCode * err)
}
/*Skips the copyright*/
T_FileStream_read(infile , throwAway, COPYRIGHT_STRING_LENGTH);
T_FileStream_read(infile , throwAway, UCNV_COPYRIGHT_STRING_LENGTH);
myConverter = (UConverter *) icu_malloc (sizeof (UConverter));
if (myConverter == NULL)
@ -244,9 +260,9 @@ UConverter* createConverterFromFile (const char *fileName, UErrorCode * err)
*/
switch (myConverter->sharedData->conversionType)
{
case SBCS:
case UCNV_SBCS:
{
myConverter->sharedData->table = (ConverterTable *) icu_malloc (sizeof (SBCS_TABLE));
myConverter->sharedData->table = (UConverterTable *) icu_malloc (sizeof (UConverterSBCSTable));
if (myConverter->sharedData->table == NULL)
{
icu_free (myConverter->sharedData);
@ -259,10 +275,10 @@ UConverter* createConverterFromFile (const char *fileName, UErrorCode * err)
}
break;
case DBCS:
case EBCDIC_STATEFUL:
case UCNV_DBCS:
case UCNV_EBCDIC_STATEFUL:
{
myConverter->sharedData->table = (ConverterTable *) icu_malloc (sizeof (DBCS_TABLE));
myConverter->sharedData->table = (UConverterTable *) icu_malloc (sizeof (UConverterDBCSTable));
if (myConverter->sharedData->table == NULL)
{
icu_free (myConverter->sharedData);
@ -275,9 +291,9 @@ UConverter* createConverterFromFile (const char *fileName, UErrorCode * err)
}
break;
case MBCS:
case UCNV_MBCS:
{
myConverter->sharedData->table = (ConverterTable *) icu_malloc (sizeof (MBCS_TABLE));
myConverter->sharedData->table = (UConverterTable *) icu_malloc (sizeof (UConverterMBCSTable));
if (myConverter->sharedData->table == NULL)
{
icu_free (myConverter->sharedData);
@ -300,12 +316,12 @@ UConverter* createConverterFromFile (const char *fileName, UErrorCode * err)
}
};
/*there could be a FAILURE on the createCompact{Short,Byte}ArrayFromFile
/*there could be a U_FAILURE on the createCompact{Short,Byte}ArrayFromFile
*calls, if so we don't want to initialize
*/
T_FileStream_close (infile);
if (SUCCESS (*err))
if (U_SUCCESS (*err))
{
initializeDataConverter (myConverter);
}
@ -317,11 +333,11 @@ UConverter* createConverterFromFile (const char *fileName, UErrorCode * err)
void
copyPlatformString (char *platformString, UCNV_PLATFORM pltfrm)
copyPlatformString (char *platformString, UConverterPlatform pltfrm)
{
switch (pltfrm)
{
case IBM:
case UCNV_IBM:
{
icu_strcpy (platformString, "ibm");
break;
@ -338,31 +354,31 @@ void
/*returns a converter type from a string
*/
UCNV_TYPE
UConverterType
getAlgorithmicTypeFromName (const char *realName)
{
if (icu_strcmp (realName, "UTF8") == 0)
return UTF8;
return UCNV_UTF8;
else if (icu_strcmp (realName, "UTF16_BigEndian") == 0)
return UTF16_BigEndian;
return UCNV_UTF16_BigEndian;
else if (icu_strcmp (realName, "UTF16_LittleEndian") == 0)
return UTF16_LittleEndian;
return UCNV_UTF16_LittleEndian;
else if (icu_strcmp (realName, "LATIN_1") == 0)
return LATIN_1;
return UCNV_LATIN_1;
else if (icu_strcmp (realName, "JIS") == 0)
return JIS;
return UCNV_JIS;
else if (icu_strcmp (realName, "EUC") == 0)
return EUC;
return UCNV_EUC;
else if (icu_strcmp (realName, "GB") == 0)
return GB;
return UCNV_GB;
else if (icu_strcmp (realName, "ISO_2022") == 0)
return ISO_2022;
return UCNV_ISO_2022;
else
return UNSUPPORTED_CONVERTER;
return UCNV_UNSUPPORTED_CONVERTER;
}
UCNV_PLATFORM
UConverterPlatform
getPlatformFromName (char *name)
{
char myPlatform[10];
@ -372,9 +388,9 @@ UCNV_PLATFORM
strtoupper (myPlatform);
if (icu_strcmp (myPlatform, "IBM") == 0)
return IBM;
return UCNV_IBM;
else
return UNKNOWN;
return UCNV_UNKNOWN;
}
int32_t
@ -407,7 +423,7 @@ void shareConverterData (UConverterSharedData * data)
UHashtable* myHT = uhash_openSize ((UHashFunction) uhash_hashSharedData,
AVAILABLE_CONVERTERS,
&err);
if (FAILURE (err)) return;
if (U_FAILURE (err)) return;
umtx_lock (NULL);
if (SHARED_DATA_HASHTABLE == NULL) SHARED_DATA_HASHTABLE = myHT;
else uhash_close(myHT);
@ -446,7 +462,7 @@ bool_t deleteSharedConverterData (UConverterSharedData * deadSharedData)
switch (deadSharedData->conversionType)
{
case SBCS:
case UCNV_SBCS:
{
ucmp8_close (deadSharedData->table->sbcs.fromUnicode);
icu_free (deadSharedData->table);
@ -454,7 +470,7 @@ bool_t deleteSharedConverterData (UConverterSharedData * deadSharedData)
};
break;
case MBCS:
case UCNV_MBCS:
{
ucmp16_close (deadSharedData->table->mbcs.fromUnicode);
ucmp16_close (deadSharedData->table->mbcs.toUnicode);
@ -463,8 +479,8 @@ bool_t deleteSharedConverterData (UConverterSharedData * deadSharedData)
};
break;
case DBCS:
case EBCDIC_STATEFUL:
case UCNV_DBCS:
case UCNV_EBCDIC_STATEFUL:
{
ucmp16_close (deadSharedData->table->dbcs.fromUnicode);
ucmp16_close (deadSharedData->table->dbcs.toUnicode);
@ -482,7 +498,7 @@ bool_t deleteSharedConverterData (UConverterSharedData * deadSharedData)
int32_t uhash_hashIString(const void* name)
{
char myName[MAX_CONVERTER_NAME_LENGTH];
char myName[UCNV_MAX_CONVERTER_NAME_LENGTH];
icu_strcpy(myName, (char*)name);
strtoupper(myName);
@ -503,7 +519,7 @@ bool_t isDataBasedConverter (const char *name)
{
myHT = uhash_open (uhash_hashIString, &err);
if (FAILURE (err)) return FALSE;
if (U_FAILURE (err)) return FALSE;
while (algorithmicConverterNames[i][0] != '\0')
{
/*Stores in the hashtable a pointer to the statically init'ed array containing
@ -548,12 +564,12 @@ bool_t isDataBasedConverter (const char *name)
UConverter *
createConverter (const char *converterName, UErrorCode * err)
{
char realName[MAX_CONVERTER_NAME_LENGTH];
char realName[UCNV_MAX_CONVERTER_NAME_LENGTH];
UConverter *myUConverter = NULL;
UConverterSharedData *mySharedConverterData = NULL;
Mutex *updatingReferenceCounterMutex = NULL;
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
if (resolveName (realName, converterName) == FALSE)
@ -572,7 +588,7 @@ UConverter *
/*Not cached, we need to stream it in from file */
myUConverter = createConverterFromFile (converterName, err);
if (FAILURE (*err) || (myUConverter == NULL))
if (U_FAILURE (*err) || (myUConverter == NULL))
{
return myUConverter;
}
@ -615,7 +631,7 @@ UConverter *
if (mySharedConverterData == NULL)
{
myUConverter = createConverterFromAlgorithmicType (realName, err);
if (FAILURE (*err) || (myUConverter == NULL))
if (U_FAILURE (*err) || (myUConverter == NULL))
{
icu_free (myUConverter);
return NULL;
@ -670,8 +686,8 @@ void initializeDataConverter (UConverter * myUConverter)
myUConverter->fromUnicodeStatus = 0x00;
myUConverter->sharedData->defaultConverterValues.toUnicodeStatus = 0x00;
myUConverter->fromCharErrorBehaviour = (UCNV_ToUCallBack) MissingCharAction_SUBSTITUTE;
myUConverter->fromUCharErrorBehaviour = (UCNV_FromUCallBack) MissingUnicodeAction_SUBSTITUTE;
myUConverter->fromCharErrorBehaviour = (UConverterToUCallback) UCNV_TO_U_CALLBACK_SUBSTITUTE;
myUConverter->fromUCharErrorBehaviour = (UConverterFromUCallback) UCNV_FROM_U_CALLBACK_SUBSTITUTE;
myUConverter->extraInfo = NULL;
return;
@ -694,8 +710,8 @@ void
myConverter->mode = UCNV_SI;
myConverter->fromCharErrorBehaviour = (UCNV_ToUCallBack) MissingCharAction_SUBSTITUTE;
myConverter->fromUCharErrorBehaviour = (UCNV_FromUCallBack) MissingUnicodeAction_SUBSTITUTE;
myConverter->fromCharErrorBehaviour = (UConverterToUCallback) UCNV_TO_U_CALLBACK_SUBSTITUTE;
myConverter->fromUCharErrorBehaviour = (UConverterFromUCallback) UCNV_FROM_U_CALLBACK_SUBSTITUTE;
myConverter->charErrorBufferLength = 0;
myConverter->UCharErrorBufferLength = 0;
@ -704,7 +720,7 @@ void
switch (myConverter->sharedData->conversionType)
{
case UTF8:
case UCNV_UTF8:
{
myConverter->sharedData->minBytesPerChar = 1;
myConverter->sharedData->maxBytesPerChar = 4;
@ -713,7 +729,7 @@ void
myConverter->subCharLen = 3;
myConverter->toUnicodeStatus = 0;
myConverter->fromUnicodeStatus = 0; /* srl */
myConverter->sharedData->platform = IBM;
myConverter->sharedData->platform = UCNV_IBM;
myConverter->sharedData->codepage = 1208;
icu_strcpy(myConverter->sharedData->name, "UTF8");
icu_memcpy (myConverter->subChar, UTF8_subChar, 3);
@ -721,7 +737,7 @@ void
break;
}
case LATIN_1:
case UCNV_LATIN_1:
{
myConverter->sharedData->minBytesPerChar = 1;
myConverter->sharedData->maxBytesPerChar = 1;
@ -729,7 +745,7 @@ void
myConverter->sharedData->defaultConverterValues.subCharLen = 1;
myConverter->subCharLen = 1;
myConverter->toUnicodeStatus = 0;
myConverter->sharedData->platform = IBM;
myConverter->sharedData->platform = UCNV_IBM;
myConverter->sharedData->codepage = 819;
icu_strcpy(myConverter->sharedData->name, "LATIN_1");
*(myConverter->subChar) = LATIN1_subChar;
@ -737,7 +753,7 @@ void
break;
}
case UTF16_BigEndian:
case UCNV_UTF16_BigEndian:
{
myConverter->sharedData->minBytesPerChar = 2;
myConverter->sharedData->maxBytesPerChar = 2;
@ -747,14 +763,14 @@ void
myConverter->toUnicodeStatus = 0;
myConverter->fromUnicodeStatus = 0;
icu_strcpy(myConverter->sharedData->name, "UTF_16BE");
myConverter->sharedData->platform = IBM;
myConverter->sharedData->platform = UCNV_IBM;
myConverter->sharedData->codepage = 1200;
icu_memcpy (myConverter->subChar, UTF16BE_subChar, 2);
icu_memcpy (myConverter->sharedData->defaultConverterValues.subChar, UTF16BE_subChar, 2);
break;
}
case UTF16_LittleEndian:
case UCNV_UTF16_LittleEndian:
{
myConverter->sharedData->minBytesPerChar = 2;
myConverter->sharedData->maxBytesPerChar = 2;
@ -763,14 +779,14 @@ void
myConverter->subCharLen = 2;
myConverter->toUnicodeStatus = 0;
myConverter->fromUnicodeStatus = 0;
myConverter->sharedData->platform = IBM;
myConverter->sharedData->platform = UCNV_IBM;
myConverter->sharedData->codepage = 1200;
icu_strcpy(myConverter->sharedData->name, "UTF_16LE");
icu_memcpy (myConverter->subChar, UTF16LE_subChar, 2);
icu_memcpy (myConverter->sharedData->defaultConverterValues.subChar, UTF16LE_subChar, 2);
break;
}
case EUC:
case UCNV_EUC:
{
myConverter->sharedData->minBytesPerChar = 1;
myConverter->sharedData->maxBytesPerChar = 2;
@ -782,7 +798,7 @@ void
icu_memcpy (myConverter->sharedData->defaultConverterValues.subChar, EUC_subChar, 2);
break;
}
case ISO_2022:
case UCNV_ISO_2022:
{
myConverter->charErrorBuffer[0] = 0x1b;
myConverter->charErrorBuffer[1] = 0x25;
@ -799,12 +815,12 @@ void
icu_strcpy(myConverter->sharedData->name, "ISO_2022");
*(myConverter->subChar) = LATIN1_subChar;
*(myConverter->sharedData->defaultConverterValues.subChar) = LATIN1_subChar;
myConverter->extraInfo = icu_malloc (sizeof (UCNV_Data2022));
((UCNV_Data2022 *) myConverter->extraInfo)->currentConverter = NULL;
((UCNV_Data2022 *) myConverter->extraInfo)->escSeq2022Length = 0;
myConverter->extraInfo = icu_malloc (sizeof (UConverterDataISO2022));
((UConverterDataISO2022 *) myConverter->extraInfo)->currentConverter = NULL;
((UConverterDataISO2022 *) myConverter->extraInfo)->escSeq2022Length = 0;
break;
}
case GB:
case UCNV_GB:
{
myConverter->sharedData->minBytesPerChar = 2;
myConverter->sharedData->maxBytesPerChar = 2;
@ -816,7 +832,7 @@ void
icu_memcpy (myConverter->sharedData->defaultConverterValues.subChar, GB_subChar, 2);
break;
}
case JIS:
case UCNV_JIS:
{
myConverter->sharedData->minBytesPerChar = 2;
myConverter->sharedData->maxBytesPerChar = 2;
@ -848,9 +864,9 @@ UConverter *
int32_t i = 0;
UConverter *myConverter = NULL;
UConverterSharedData *mySharedData = NULL;
UCNV_TYPE myType = getAlgorithmicTypeFromName (actualName);
UConverterType myType = getAlgorithmicTypeFromName (actualName);
if (FAILURE (*err))
if (U_FAILURE (*err))
return NULL;
myConverter = (UConverter *) icu_malloc (sizeof (UConverter));
@ -872,7 +888,7 @@ UConverter *
icu_strcpy (mySharedData->name, actualName);
/*Initializes the referenceCounter to 1 */
mySharedData->referenceCounter = 1;
mySharedData->platform = UNKNOWN;
mySharedData->platform = UCNV_UNKNOWN;
mySharedData->codepage = 0;
mySharedData->conversionType = myType;
myConverter->sharedData = mySharedData;

78
icu4c/source/common/ucnv_cnv.c
View file

@ -49,7 +49,7 @@ void flushInternalCharBuffer (UConverter * _this,
UErrorCode * err);
#define FromU_CALLBACK_MACRO(_this, myTarget, myTargetIndex, targetLimit, mySource, mySourceIndex, sourceLimit, offsets, flush, err) \
if (_this->fromUCharErrorBehaviour == (UCNV_FromUCallBack) MissingUnicodeAction_STOP) break;\
if (_this->fromUCharErrorBehaviour == (UConverterFromUCallback) UCNV_FROM_U_CALLBACK_STOP) break;\
else \
{ \
char *myTargetCopy = myTarget + myTargetIndex; \
@ -70,7 +70,7 @@ void flushInternalCharBuffer (UConverter * _this,
}
#define ToU_CALLBACK_MACRO(_this, myTarget, myTargetIndex, targetLimit, mySource, mySourceIndex, sourceLimit, offsets, flush, err) \
if (_this->fromCharErrorBehaviour == (UCNV_ToUCallBack) MissingCharAction_STOP) break; \
if (_this->fromCharErrorBehaviour == (UConverterToUCallback) UCNV_TO_U_CALLBACK_STOP) break; \
else \
{ \
UChar *myTargetCopy = myTarget + myTargetIndex; \
@ -90,7 +90,7 @@ void flushInternalCharBuffer (UConverter * _this,
}
#define FromU_CALLBACK_OFFSETS_LOGIC_MACRO(_this, myTarget, myTargetIndex, targetLimit, mySource, mySourceIndex, sourceLimit, offsets, flush, err) \
if (_this->fromUCharErrorBehaviour == (UCNV_FromUCallBack) MissingUnicodeAction_STOP) break;\
if (_this->fromUCharErrorBehaviour == (UConverterFromUCallback) UCNV_FROM_U_CALLBACK_STOP) break;\
else \
{ \
char *myTargetCopy = myTarget + myTargetIndex; \
@ -115,7 +115,7 @@ void flushInternalCharBuffer (UConverter * _this,
#define ToU_CALLBACK_OFFSETS_LOGIC_MACRO(_this, myTarget, myTargetIndex, targetLimit, mySource, mySourceIndex, sourceLimit, offsets, flush, err) \
if (_this->fromCharErrorBehaviour == (UCNV_ToUCallBack) MissingCharAction_STOP) break; \
if (_this->fromCharErrorBehaviour == (UConverterToUCallback) UCNV_TO_U_CALLBACK_STOP) break; \
else \
{ \
UChar *myTargetCopy = myTarget + myTargetIndex; \
@ -307,7 +307,7 @@ void T_UConverter_toUnicode_SBCS (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidCharLength = 0;
}
}
@ -392,7 +392,7 @@ void T_UConverter_toUnicode_DBCS (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidCharLength = 0;
}
}
@ -412,7 +412,7 @@ void T_UConverter_toUnicode_DBCS (UConverter * _this,
&& (_this->toUnicodeStatus != 0x00))
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -510,7 +510,7 @@ void T_UConverter_fromUnicode_LATIN_1 (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidUCharLength = 0;
}
}
@ -579,7 +579,7 @@ void T_UConverter_fromUnicode_SBCS (UConverter * _this,
offsets,
flush,
err);
if (FAILURE (*err))
if (U_FAILURE (*err))
{
break;
}
@ -685,7 +685,7 @@ void T_UConverter_toUnicode_EBCDIC_STATEFUL (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidCharLength = 0;
}
}
@ -704,7 +704,7 @@ void T_UConverter_toUnicode_EBCDIC_STATEFUL (UConverter * _this,
&& (mySourceIndex == sourceLength)
&& (flush == TRUE))
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -813,7 +813,7 @@ void T_UConverter_toUnicode_EBCDIC_STATEFUL_OFFSETS_LOGIC (UConverter * _this,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidCharLength = 0;
}
}
@ -832,7 +832,7 @@ void T_UConverter_toUnicode_EBCDIC_STATEFUL_OFFSETS_LOGIC (UConverter * _this,
&& (mySourceIndex == sourceLength)
&& (flush == TRUE))
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -935,7 +935,7 @@ void T_UConverter_toUnicode_MBCS (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidCharLength = 0;
}
}
@ -954,7 +954,7 @@ void T_UConverter_toUnicode_MBCS (UConverter * _this,
&& (mySourceIndex == sourceLength)
&& (flush == TRUE))
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -1071,7 +1071,7 @@ void T_UConverter_toUnicode_MBCS_OFFSETS_LOGIC (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidCharLength = 0;
}
}
@ -1090,7 +1090,7 @@ void T_UConverter_toUnicode_MBCS_OFFSETS_LOGIC (UConverter * _this,
&& (mySourceIndex == sourceLength)
&& (flush == TRUE))
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -1203,7 +1203,7 @@ void T_UConverter_fromUnicode_EBCDIC_STATEFUL (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidUCharLength = 0;
}
}
@ -1329,7 +1329,7 @@ void T_UConverter_fromUnicode_EBCDIC_STATEFUL_OFFSETS_LOGIC (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidUCharLength = 0;
}
}
@ -1420,7 +1420,7 @@ void T_UConverter_fromUnicode_MBCS (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidUCharLength = 0;
}
}
@ -1519,7 +1519,7 @@ void T_UConverter_fromUnicode_MBCS_OFFSETS_LOGIC (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidUCharLength = 0;
}
}
@ -1643,7 +1643,7 @@ void changeState_2022(UConverter* _this,
UConverter* myUConverter;
uint32_t key = _this->toUnicodeStatus;
UCNV_TableStates_2022 value;
UCNV_Data2022* myData2022 = ((UCNV_Data2022*)_this->extraInfo);
UConverterDataISO2022* myData2022 = ((UConverterDataISO2022*)_this->extraInfo);
const char* chosenConverterName = NULL;
int32_t offset;
@ -1792,7 +1792,7 @@ void changeState_2022(UConverter* _this,
#ifdef Debug
printf("Error = %d open \"%s\"\n", *err, chosenConverterName);
#endif /*Debug*/
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
/*Customize the converter with the attributes set on the 2022 converter*/
myUConverter->fromUCharErrorBehaviour = _this->fromUCharErrorBehaviour;
@ -1864,7 +1864,7 @@ void T_UConverter_toUnicode_ISO_2022(UConverter* _this,
char const* sourceStart;
/*Arguments Check*/
if (FAILURE(*err)) return;
if (U_FAILURE(*err)) return;
if ((_this == NULL) || (targetLimit < *target) || (sourceLimit < *source))
{
*err = U_ILLEGAL_ARGUMENT_ERROR;
@ -1885,7 +1885,7 @@ void T_UConverter_toUnicode_ISO_2022(UConverter* _this,
printf("source %X\n mySourceLimit %X\n sourceLimit %X\n", *source, mySourceLimit, sourceLimit);
#endif /*Debug*/
ucnv_toUnicode(((UCNV_Data2022*)(_this->extraInfo))->currentConverter,
ucnv_toUnicode(((UConverterDataISO2022*)(_this->extraInfo))->currentConverter,
target,
targetLimit,
source,
@ -1905,7 +1905,7 @@ void T_UConverter_toUnicode_ISO_2022(UConverter* _this,
-Error while converting
*/
if (FAILURE(*err) || (*source == sourceLimit)) return;
if (U_FAILURE(*err) || (*source == sourceLimit)) return;
#ifdef Debug
puts("Got Here!");
fflush(stdout);
@ -1938,7 +1938,7 @@ void T_UConverter_toUnicode_ISO_2022_OFFSETS_LOGIC(UConverter* _this,
char const* sourceStart;
/*Arguments Check*/
if (FAILURE(*err)) return;
if (U_FAILURE(*err)) return;
if ((_this == NULL) || (targetLimit < *target) || (sourceLimit < *source))
{
*err = U_ILLEGAL_ARGUMENT_ERROR;
@ -1958,7 +1958,7 @@ void T_UConverter_toUnicode_ISO_2022_OFFSETS_LOGIC(UConverter* _this,
printf("source %X\n mySourceLimit %X\n sourceLimit %X\n", *source, mySourceLimit, sourceLimit);
#endif /*Debug*/
ucnv_toUnicode(((UCNV_Data2022*)(_this->extraInfo))->currentConverter,
ucnv_toUnicode(((UConverterDataISO2022*)(_this->extraInfo))->currentConverter,
target,
targetLimit,
source,
@ -1985,7 +1985,7 @@ void T_UConverter_toUnicode_ISO_2022_OFFSETS_LOGIC(UConverter* _this,
-Error while converting
*/
if (FAILURE(*err) || (*source == sourceLimit)) return;
if (U_FAILURE(*err) || (*source == sourceLimit)) return;
#ifdef Debug
puts("Got Here!");
fflush(stdout);
@ -2074,7 +2074,7 @@ void T_UConverter_fromUnicode_DBCS (UConverter * _this,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidUCharLength = 0;
}
}
@ -2469,11 +2469,11 @@ void T_UConverter_toUnicode_UTF16_BE (UConverter * _this,
}
}
if (SUCCESS(*err) && flush
if (U_SUCCESS(*err) && flush
&& (mySourceIndex == sourceLength)
&& (_this->toUnicodeStatus != 0x00))
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -2537,11 +2537,11 @@ void T_UConverter_toUnicode_UTF16_LE (UConverter * _this,
}
if (SUCCESS(*err) && flush
if (U_SUCCESS(*err) && flush
&& (mySourceIndex == sourceLength)
&& (_this->toUnicodeStatus != 0x00))
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -2613,7 +2613,7 @@ void T_UConverter_toUnicode_UTF8 (UConverter * _this,
{
if (flush)
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -2679,7 +2679,7 @@ void T_UConverter_toUnicode_UTF8 (UConverter * _this,
offsets,
flush,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidCharLength = 0;
}
}
@ -2752,7 +2752,7 @@ void T_UConverter_toUnicode_UTF8_OFFSETS_LOGIC (UConverter * _this,
{
if (flush)
{
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
*err = U_TRUNCATED_CHAR_FOUND;
_this->toUnicodeStatus = 0x00;
@ -2821,7 +2821,7 @@ void T_UConverter_toUnicode_UTF8_OFFSETS_LOGIC (UConverter * _this,
err);
if (FAILURE (*err)) break;
if (U_FAILURE (*err)) break;
_this->invalidCharLength = 0;
}
}
@ -3024,7 +3024,7 @@ UChar T_UConverter_getNextUChar_ISO_2022(UConverter* converter,
if (converter->mode == UCNV_SO) /*Already doing some conversion*/
{
return ucnv_getNextUChar(((UCNV_Data2022*)(converter->extraInfo))->currentConverter,
return ucnv_getNextUChar(((UConverterDataISO2022*)(converter->extraInfo))->currentConverter,
source,
mySourceLimit,
err);

42
icu4c/source/common/ucnv_err.c
View file

@ -36,7 +36,7 @@
#define ToOffset(a) a<=9?(0x0030+a):(0x0030+a+7)
bool_t
CONVERSION_SUCCESS (UErrorCode err)
CONVERSION_U_SUCCESS (UErrorCode err)
{
if ((err == U_INVALID_CHAR_FOUND) || (err == U_ILLEGAL_CHAR_FOUND)) return FALSE;
else return TRUE;
@ -78,7 +78,7 @@ static void itou (UChar * buffer, int32_t i, int32_t radix, int32_t pad)
}
/*Function Pointer STOPS at the ILLEGAL_SEQUENCE */
void MissingUnicodeAction_STOP (UConverter * _this,
void UCNV_FROM_U_CALLBACK_STOP (UConverter * _this,
char **target,
const char *targetLimit,
const UChar ** source,
@ -92,7 +92,7 @@ void MissingUnicodeAction_STOP (UConverter * _this,
/*Function Pointer STOPS at the ILLEGAL_SEQUENCE */
void MissingCharAction_STOP (UConverter * _this,
void UCNV_TO_U_CALLBACK_STOP (UConverter * _this,
UChar ** target,
const UChar * targetLimit,
const char **source,
@ -104,7 +104,7 @@ void MissingCharAction_STOP (UConverter * _this,
return;
}
void MissingUnicodeAction_SKIP (UConverter * _this,
void UCNV_FROM_U_CALLBACK_SKIP (UConverter * _this,
char **target,
const char *targetLimit,
const UChar ** source,
@ -113,11 +113,11 @@ void MissingUnicodeAction_SKIP (UConverter * _this,
bool_t flush,
UErrorCode * err)
{
if (CONVERSION_SUCCESS (*err)) return;
if (CONVERSION_U_SUCCESS (*err)) return;
*err = U_ZERO_ERROR;
}
void MissingUnicodeAction_SUBSTITUTE (UConverter * _this,
void UCNV_FROM_U_CALLBACK_SUBSTITUTE (UConverter * _this,
char **target,
const char *targetLimit,
const UChar ** source,
@ -131,12 +131,12 @@ void MissingUnicodeAction_SUBSTITUTE (UConverter * _this,
if (CONVERSION_SUCCESS (*err)) return;
if (CONVERSION_U_SUCCESS (*err)) return;
/*In case we're dealing with a modal converter a la EBCDIC_STATEFUL,
/*In case we're dealing with a modal converter a la UCNV_EBCDIC_STATEFUL,
we need to make sure that the emitting of the substitution charater in the right mode*/
icu_memcpy(togo, _this->subChar, togoLen = _this->subCharLen);
if (ucnv_getType(_this) == EBCDIC_STATEFUL)
if (ucnv_getType(_this) == UCNV_EBCDIC_STATEFUL)
{
if ((_this->fromUnicodeStatus)&&(togoLen != 2))
{
@ -200,7 +200,7 @@ void MissingUnicodeAction_SUBSTITUTE (UConverter * _this,
*escape sequence to the target codepage (if conversion failure happens then
*we revert to substituting with subchar)
*/
void MissingUnicodeAction_SUBSTITUTEwithValue (UConverter * _this,
void UCNV_FROM_U_CALLBACK_ESCAPE (UConverter * _this,
char **target,
const char *targetLimit,
const UChar ** source,
@ -224,15 +224,15 @@ void MissingUnicodeAction_SUBSTITUTEwithValue (UConverter * _this,
uint32_t myFromUnicodeStatus = _this->fromUnicodeStatus;
if (CONVERSION_SUCCESS (*err)) return;
if (CONVERSION_U_SUCCESS (*err)) return;
ucnv_reset (&myConverter);
myConverter.fromUnicodeStatus = myFromUnicodeStatus;
ucnv_setFromUCallBack (&myConverter,
(UCNV_FromUCallBack) MissingUnicodeAction_STOP,
(UConverterFromUCallback) UCNV_FROM_U_CALLBACK_STOP,
&err2);
if (FAILURE (err2))
if (U_FAILURE (err2))
{
*err = err2;
return;
@ -260,9 +260,9 @@ void MissingUnicodeAction_SUBSTITUTEwithValue (UConverter * _this,
TRUE,
&err2);
if (FAILURE (err2))
if (U_FAILURE (err2))
{
MissingUnicodeAction_SUBSTITUTE (_this,
UCNV_FROM_U_CALLBACK_SUBSTITUTE (_this,
target,
targetLimit,
source,
@ -321,7 +321,7 @@ void MissingUnicodeAction_SUBSTITUTEwithValue (UConverter * _this,
void MissingCharAction_SKIP (UConverter * _this,
void UCNV_TO_U_CALLBACK_SKIP (UConverter * _this,
UChar ** target,
const UChar * targetLimit,
const char **source,
@ -330,11 +330,11 @@ void MissingCharAction_SKIP (UConverter * _this,
bool_t flush,
UErrorCode * err)
{
if (CONVERSION_SUCCESS (*err)) return;
if (CONVERSION_U_SUCCESS (*err)) return;
*err = U_ZERO_ERROR;
}
void MissingCharAction_SUBSTITUTE (UConverter * _this,
void UCNV_TO_U_CALLBACK_SUBSTITUTE (UConverter * _this,
UChar ** target,
const UChar * targetLimit,
const char **source,
@ -344,7 +344,7 @@ void MissingCharAction_SUBSTITUTE (UConverter * _this,
UErrorCode * err)
{
if (CONVERSION_SUCCESS (*err)) return;
if (CONVERSION_U_SUCCESS (*err)) return;
if ((targetLimit - *target) >= 1)
{
@ -367,7 +367,7 @@ void MissingCharAction_SUBSTITUTE (UConverter * _this,
/*uses itou to get a unicode escape sequence of the offensive sequence,
*and uses that as the substitution sequence
*/
void MissingCharAction_SUBSTITUTEwithValue (UConverter * _this,
void UCNV_TO_U_CALLBACK_ESCAPE (UConverter * _this,
UChar ** target,
const UChar * targetLimit,
const char **source,
@ -383,7 +383,7 @@ void MissingCharAction_SUBSTITUTEwithValue (UConverter * _this,
int32_t j = 0, i = 0;
const int32_t* offsets_end = offsets +( targetLimit - *target);
if (CONVERSION_SUCCESS (*err)) return;
if (CONVERSION_U_SUCCESS (*err)) return;
codepoint[0] = (UChar) UNICODE_PERCENT_SIGN_CODEPOINT; /* adding % */
codepoint[1] = (UChar) UNICODE_X_CODEPOINT; /* adding X */

22
icu4c/source/common/ucnv_err.h
View file

@ -23,10 +23,10 @@
* UErrorCode err = U_ZERO_ERROR;
* UConverter* myConverter = T_UConverter_create("ibm-949", &err);
*
* if (SUCCESS(err))
* if (U_SUCCESS(err))
* {
* T_UConverter_setMissingUnicodeAction(myConverter, (MissingUnicodeAction)MissingUnicodeAction_STOP, &err);
* T_UConverter_setMissingCharAction(myConverter, (MissingCharAction)MissingCharAction_SUBSTITUTE, &err);
* T_UConverter_setMissingUnicodeAction(myConverter, (MissingUnicodeAction)UCNV_FROM_U_CALLBACK_STOP, &err);
* T_UConverter_setMissingCharAction(myConverter, (MissingCharAction)UCNV_TO_U_CALLBACK_SUBSTITUTE, &err);
* }
* ...
*
@ -44,7 +44,7 @@
/*Functor STOPS at the ILLEGAL_SEQUENCE */
CAPI void U_EXPORT2 MissingUnicodeAction_STOP (UConverter * _this,
U_CAPI void U_EXPORT2 UCNV_FROM_U_CALLBACK_STOP (UConverter * _this,
char **target,
const char *targetLimit,
const UChar ** source,
@ -55,7 +55,7 @@ CAPI void U_EXPORT2 MissingUnicodeAction_STOP (UConverter * _this,
/*Functor STOPS at the ILLEGAL_SEQUENCE */
CAPI void U_EXPORT2 MissingCharAction_STOP (UConverter * _this,
U_CAPI void U_EXPORT2 UCNV_TO_U_CALLBACK_STOP (UConverter * _this,
UChar ** target,
const UChar * targetLimit,
const char **source,
@ -68,7 +68,7 @@ CAPI void U_EXPORT2 MissingCharAction_STOP (UConverter * _this,
/*Functor SKIPs the ILLEGAL_SEQUENCE */
CAPI void U_EXPORT2 MissingUnicodeAction_SKIP (UConverter * _this,
U_CAPI void U_EXPORT2 UCNV_FROM_U_CALLBACK_SKIP (UConverter * _this,
char **target,
const char *targetLimit,
const UChar ** source,
@ -83,7 +83,7 @@ CAPI void U_EXPORT2 MissingUnicodeAction_SKIP (UConverter * _this,
* store the left over data in target, before transcoding the "source Stream"
*/
CAPI void U_EXPORT2 MissingUnicodeAction_SUBSTITUTE (UConverter * _this,
U_CAPI void U_EXPORT2 UCNV_FROM_U_CALLBACK_SUBSTITUTE (UConverter * _this,
char **target,
const char *targetLimit,
const UChar ** source,
@ -101,7 +101,7 @@ CAPI void U_EXPORT2 MissingUnicodeAction_SUBSTITUTE (UConverter * _this,
* store the left over data in target, before transcoding the "source Stream"
*/
CAPI void U_EXPORT2 MissingUnicodeAction_SUBSTITUTEwithValue (UConverter * _this,
U_CAPI void U_EXPORT2 UCNV_FROM_U_CALLBACK_ESCAPE (UConverter * _this,
char **target,
const char *targetLimit,
const UChar ** source,
@ -112,7 +112,7 @@ CAPI void U_EXPORT2 MissingUnicodeAction_SUBSTITUTEwithValue (UConverter * _this
/*Functor SKIPs the ILLEGAL_SEQUENCE */
CAPI void U_EXPORT2 MissingCharAction_SKIP (UConverter * _this,
U_CAPI void U_EXPORT2 UCNV_TO_U_CALLBACK_SKIP (UConverter * _this,
UChar ** target,
const UChar * targetLimit,
const char **source,
@ -127,7 +127,7 @@ CAPI void U_EXPORT2 MissingCharAction_SKIP (UConverter * _this,
* will be set to U_INDEX_OUTOFBOUNDS_ERROR. The next time T_UConverter_fromUnicode is called, it will
* store the left over data in target, before transcoding the "source Stream"
*/
CAPI void U_EXPORT2 MissingCharAction_SUBSTITUTE (UConverter * _this,
U_CAPI void U_EXPORT2 UCNV_TO_U_CALLBACK_SUBSTITUTE (UConverter * _this,
UChar ** target,
const UChar * targetLimit,
const char **source,
@ -143,7 +143,7 @@ CAPI void U_EXPORT2 MissingCharAction_SUBSTITUTE (UConverter * _this,
* store the left over data in target, before transcoding the "source Stream"
*/
CAPI void U_EXPORT2 MissingCharAction_SUBSTITUTEwithValue (UConverter * _this,
U_CAPI void U_EXPORT2 UCNV_TO_U_CALLBACK_ESCAPE (UConverter * _this,
UChar ** target,
const UChar * targetLimit,
const char **source,

71
icu4c/source/common/ucnv_imp.h Normal file
View file

@ -0,0 +1,71 @@
/*
*******************************************************************************
* *
* COPYRIGHT: *
* (C) Copyright International Business Machines Corporation, 1998 *
* Licensed Material - Program-Property of IBM - All Rights Reserved. *
* US Government Users Restricted Rights - Use, duplication, or disclosure *
* restricted by GSA ADP Schedule Contract with IBM Corp. *
* *
*******************************************************************************
*
*
*
* ucnv_imp.h:
* Contains all internal and external data structure definitions
* Created & Maitained by Bertrand A. Damiba
*
*
*
* ATTENTION:
* ---------
* Although the data structures in this file are open and stack allocatable
* we reserve the right to hide them in further releases.
*/
#ifndef UCNV_IMP_H
#define UCNV_IMP_H
#include "utypes.h"
typedef struct UHashtable UHashtable;
/*Hashtable used to store UConverterSharedData objects supporting
*the Caching mechanism
*/
extern UHashtable *SHARED_DATA_HASHTABLE;
/*Hashtable generated (lazy eval) by algorithmicConverterNames for fast lookup
*Behaviour is completely different for the Algorithmic conversions.
*we use this table to as a litmus test.
*/
extern UHashtable *ALGORITHMIC_CONVERTERS_HASHTABLE;
/* figures out if we need to go to file to read in the data tables.
*/
UConverter *createConverter (const char *converterName, UErrorCode * err);
/* Stores the shared data in the SHARED_DATA_HASHTABLE
*/
void shareConverterData (UConverterSharedData * data);
/* gets the shared data from the SHARED_DATA_HASHTABLE (might return NULL if it isn't there)
*/
UConverterSharedData *getSharedConverterData (const char *name);
/* Deletes (frees) the Shared data it's passed. first it checks the referenceCounter to
* see if anyone is using it, if not it frees all the memory stemming from sharedConverterData and
* returns TRUE,
* otherwise returns FALSE
*/
bool_t deleteSharedConverterData (UConverterSharedData * sharedConverterData);
/* returns true if "name" is in algorithmicConverterNames
*/
bool_t isDataBasedConverter (const char *name);
void copyPlatformString (char *platformString, UConverterPlatform pltfrm);
#endif /* _UCNV_IMP */

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

@ -116,10 +116,10 @@ char *
void
setupAliasTableAndAvailableConverters (UErrorCode * err)
{
char fullFileName[MAX_FULL_FILE_NAME_LENGTH];
char fullFileName[UCNV_MAX_FULL_FILE_NAME_LENGTH];
FileStream *converterFile = NULL;
if (FAILURE (*err))
if (U_FAILURE (*err))
return;
icu_strcpy (fullFileName, uloc_getDataDirectory ());
@ -145,10 +145,10 @@ void
doSetupAliasTableAndAvailableConverters (FileStream * converterFile, UErrorCode * err)
{
Mutex *convertrsFileOpenMutex = NULL;
char myLine[MAX_LINE_TEXT];
char myLine[UCNV_MAX_LINE_TEXT];
char *line = myLine;
char actualNameToken[MAX_CONVERTER_NAME_LENGTH];
char aliasNameToken[MAX_CONVERTER_NAME_LENGTH];
char actualNameToken[UCNV_MAX_CONVERTER_NAME_LENGTH];
char aliasNameToken[UCNV_MAX_CONVERTER_NAME_LENGTH];
char *toBeHashed = NULL;
UHashtable *myALIASNAMES_HASHTABLE = NULL;
char **myAVAILABLE_CONVERTERS_NAMES = NULL;
@ -156,13 +156,13 @@ void
/*We need to do the initial work of setting everything */
myALIASNAMES_HASHTABLE = uhash_open ((UHashFunction)uhash_hashIString, err);
if (FAILURE (*err))
if (U_FAILURE (*err))
return;
if (myALIASNAMES_HASHTABLE == NULL)
return;
while (T_FileStream_readLine (converterFile, line, MAX_LINE_TEXT))
while (T_FileStream_readLine (converterFile, line, UCNV_MAX_LINE_TEXT))
{
removeComments (line);
if (line[nextTokenOffset (line, SPACE_SEPARATORS)] != '\0') /*Skips Blank lines */
@ -193,7 +193,7 @@ void
toBeHashed,
err);
}
if (FAILURE (*err))
if (U_FAILURE (*err))
return;
}
@ -235,7 +235,7 @@ bool_t
/*Lazy evaluates the Alias hashtable */
if (ALIASNAMES_HASHTABLE == NULL)
setupAliasTableAndAvailableConverters (&err);
if (FAILURE (err))
if (U_FAILURE (err))
return FALSE;
@ -259,7 +259,7 @@ bool_t
FileStream *
openConverterFile (const char *name)
{
char actualFullFilenameName[MAX_FULL_FILE_NAME_LENGTH];
char actualFullFilenameName[UCNV_MAX_FULL_FILE_NAME_LENGTH];
FileStream *tableFile = NULL;
icu_strcpy (actualFullFilenameName, uloc_getDataDirectory ());

40
icu4c/source/common/uhash.c
View file

@ -76,24 +76,24 @@ int32_t UHASH_PRIMES [] =
Note here that we are assuming 32-bit ints.
*/
CAPI UHashtable*
U_CAPI UHashtable*
uhash_open(UHashFunction func,
UErrorCode *status)
{
UHashtable* myUHT = uhash_openSize(func, 3, status);
if (SUCCESS(*status)) myUHT->isGrowable = TRUE;
if (U_SUCCESS(*status)) myUHT->isGrowable = TRUE;
return myUHT;
}
CAPI UHashtable*
U_CAPI UHashtable*
uhash_openSize(UHashFunction func,
int32_t size,
UErrorCode *status)
{
UHashtable *result;
if(FAILURE(*status)) return NULL;
if(U_FAILURE(*status)) return NULL;
result = (UHashtable*) icu_malloc(sizeof(UHashtable));
if(result == 0) {
@ -111,7 +111,7 @@ uhash_openSize(UHashFunction func,
uhash_initialize(result, uhash_leastGreaterPrimeIndex(size), status);
if(FAILURE(*status)) {
if(U_FAILURE(*status)) {
icu_free(result);
return 0;
}
@ -119,13 +119,13 @@ uhash_openSize(UHashFunction func,
return result;
}
CAPI void
U_CAPI void
uhash_setValueDeleter(UHashtable *hash, ValueDeleter del )
{
hash->valueDelete = del;
}
CAPI void
U_CAPI void
uhash_close(UHashtable *hash)
{
if (hash->valueDelete)
@ -145,12 +145,12 @@ uhash_close(UHashtable *hash)
icu_free(hash->toBeDeleted);
}
CAPI int32_t
U_CAPI int32_t
uhash_size(const UHashtable *hash)
{
return hash->count;
}
CAPI int32_t
U_CAPI int32_t
uhash_putKey(UHashtable *hash,
int32_t valueKey,
void *value,
@ -161,7 +161,7 @@ uhash_putKey(UHashtable *hash,
int32_t hashCode;
int32_t index;
if(FAILURE(*status)) return UHASH_INVALID;
if(U_FAILURE(*status)) return UHASH_INVALID;
if(hash->count > hash->highWaterMark) {
if (hash->isGrowable) uhash_rehash(hash, status);
@ -201,7 +201,7 @@ uhash_putKey(UHashtable *hash,
return hashCode;
}
CAPI int32_t
U_CAPI int32_t
uhash_put(UHashtable *hash,
void *value,
UErrorCode *status)
@ -211,7 +211,7 @@ uhash_put(UHashtable *hash,
int32_t hashCode;
int32_t index;
if(FAILURE(*status)) return UHASH_INVALID;
if(U_FAILURE(*status)) return UHASH_INVALID;
if(hash->count > hash->highWaterMark) {
if (hash->isGrowable) uhash_rehash(hash, status);
@ -252,7 +252,7 @@ uhash_put(UHashtable *hash,
return hashCode;
}
CAPI void*
U_CAPI void*
uhash_get(const UHashtable *hash,
int32_t key)
{
@ -265,7 +265,7 @@ uhash_get(const UHashtable *hash,
return result;
}
CAPI void*
U_CAPI void*
uhash_remove(UHashtable *hash,
int32_t key,
UErrorCode *status)
@ -303,7 +303,7 @@ uhash_remove(UHashtable *hash,
return result;
}
CAPI void*
U_CAPI void*
uhash_nextElement(const UHashtable *hash,
int32_t *pos)
{
@ -337,7 +337,7 @@ uhash_initialize(UHashtable *hash,
{
int32_t i;
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
if(primeIndex < 0) {
primeIndex = 0;
@ -401,7 +401,7 @@ uhash_rehash(UHashtable *hash,
int32_t newPrimeIndex = hash->primeIndex;
int32_t i;
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
if(hash->count > hash->highWaterMark) {
++newPrimeIndex;
@ -502,7 +502,7 @@ uhash_find(const UHashtable *hash,
/* Predefined hash functions */
CAPI int32_t
U_CAPI int32_t
uhash_hashUString(const void *parm)
{
const UChar *key = (const UChar*) parm;
@ -531,7 +531,7 @@ uhash_hashUString(const void *parm)
return hash & 0x7FFFFFFF;
}
CAPI int32_t
U_CAPI int32_t
uhash_hashString(const void *parm)
{
const char *key = (const char*) parm;
@ -560,7 +560,7 @@ uhash_hashString(const void *parm)
return hash & 0x7FFFFFFF;
}
CAPI int32_t
U_CAPI int32_t
uhash_hashLong(const void *parm)
{
int32_t hash = (int32_t) parm;

26
icu4c/source/common/uhash.h
View file

@ -76,7 +76,7 @@ typedef struct UHashtable UHashtable;
* @return A pointer to a UHashtable, or 0 if an error occurred.
* @see uhash_openSize
*/
CAPI UHashtable*
U_CAPI UHashtable*
uhash_open(UHashFunction func,
UErrorCode *status);
@ -90,7 +90,7 @@ uhash_open(UHashFunction func,
* @return A pointer to a UHashtable, or 0 if an error occurred.
* @see uhash_open
*/
CAPI UHashtable*
U_CAPI UHashtable*
uhash_openSize(UHashFunction func,
int32_t size,
UErrorCode *status);
@ -99,11 +99,11 @@ uhash_openSize(UHashFunction func,
* Close a UHashtable, releasing the memory used.
* @param hash The UHashtable to close.
*/
CAPI void
U_CAPI void
uhash_close(UHashtable *hash);
CAPI void
U_CAPI void
uhash_setValueDeleter(UHashtable *hash, ValueDeleter del);
/**
@ -111,7 +111,7 @@ uhash_setValueDeleter(UHashtable *hash, ValueDeleter del);
* @param hash The UHashtable to query.
* @return The number of items stored in hash.
*/
CAPI int32_t
U_CAPI int32_t
uhash_size(const UHashtable *hash);
/**
@ -122,7 +122,7 @@ uhash_size(const UHashtable *hash);
* @return The hash code associated with value.
* @see uhash_get
*/
CAPI int32_t
U_CAPI int32_t
uhash_put(UHashtable *hash,
void *value,
UErrorCode *status);
@ -135,7 +135,7 @@ uhash_put(UHashtable *hash,
* @return The hash code associated with value.
* @see uhash_get
*/
CAPI int32_t
U_CAPI int32_t
uhash_putKey(UHashtable *hash,
int32_t valueKey,
void *value,
@ -147,7 +147,7 @@ uhash_putKey(UHashtable *hash,
* @param key The hash code of the desired value.
* @return The requested item, or 0 if not found.
*/
CAPI void*
U_CAPI void*
uhash_get(const UHashtable *hash,
int32_t key);
@ -158,7 +158,7 @@ uhash_get(const UHashtable *hash,
* @param status A pointer to an UErrorCode to receive any errors.
* @return The item removed, or 0 if not found.
*/
CAPI void*
U_CAPI void*
uhash_remove(UHashtable *hash,
int32_t key,
UErrorCode *status);
@ -170,7 +170,7 @@ uhash_remove(UHashtable *hash,
* the first value, and should subsequently not be changed by the caller.
* @return The next item in the hash table, or 0 if no items remain.
*/
CAPI void*
U_CAPI void*
uhash_nextElement(const UHashtable *hash,
int32_t *pos);
@ -190,7 +190,7 @@ uhash_nextElement(const UHashtable *hash,
* @param parm The ustring (const UChar*) to hash.
* @return A hash code for parm.
*/
CAPI int32_t
U_CAPI int32_t
uhash_hashUString(const void *parm);
/**
@ -200,7 +200,7 @@ uhash_hashUString(const void *parm);
* @param parm The string (const char*) to hash.
* @return A hash code for parm.
*/
CAPI int32_t
U_CAPI int32_t
uhash_hashString(const void *parm);
/**
@ -208,7 +208,7 @@ uhash_hashString(const void *parm);
* @param parm The long (cast to void*) to hash.
* @return A hash code for parm.
*/
CAPI int32_t
U_CAPI int32_t
uhash_hashLong(const void *parm);
#endif

58
icu4c/source/common/uloc.c
View file

@ -42,9 +42,9 @@
/* UnicodeString stuff */
typedef struct UnicodeString UnicodeString;
CAPI const UChar* T_UnicodeString_getUChars(const UnicodeString *s);
U_CAPI const UChar* T_UnicodeString_getUChars(const UnicodeString *s);
/* Locale stuff */
CAPI void locale_set_default(const char *id);
U_CAPI void locale_set_default(const char *id);
/* These strings describe the resources we attempt to load from
the locale ResourceBundle data file.*/
@ -225,7 +225,7 @@ void uloc_setDefault(const char* newDefaultLocale,
UErrorCode* err)
{
if (FAILURE(*err)) return;
if (U_FAILURE(*err)) return;
/* the error code isn't currently used for anything by this function*/
if (newDefaultLocale == NULL)
@ -256,7 +256,7 @@ int32_t uloc_getParent(const char* localeID,
int offset = 0;
int count = 0;
if (FAILURE(*err)) return 0;
if (U_FAILURE(*err)) return 0;
if (localeID == NULL) localeID = uloc_getDefault();
@ -299,7 +299,7 @@ uloc_getLanguage(const char* localeID,
int i=0;
if (FAILURE(*err)) return 0;
if (U_FAILURE(*err)) return 0;
if (localeID == NULL) localeID = uloc_getDefault();
@ -323,7 +323,7 @@ uloc_getLanguage(const char* localeID,
/*We need to normalize for changes in ISO language names,
We special case out the recent ISO changes, translating them
internally to the old iso codes.*/
if (SUCCESS(*err))
if (U_SUCCESS(*err))
{
if (icu_strcmp("he", language) == 0) icu_strcpy(language, "iw");
else if (icu_strcmp("yi", language) == 0) icu_strcpy(language, "ji");
@ -342,7 +342,7 @@ int32_t uloc_getCountry(const char* localeID,
{
int i=0;
if (FAILURE(*err)) return 0;
if (U_FAILURE(*err)) return 0;
if (localeID == NULL) localeID = uloc_getDefault();
localeID = _findCharSeparator(localeID);
@ -376,7 +376,7 @@ int32_t uloc_getVariant(const char* localeID,
{
int i=0;
if (FAILURE(*err)) return 0;
if (U_FAILURE(*err)) return 0;
if (localeID == NULL) localeID = uloc_getDefault();
localeID = _findCharSeparator(localeID);
@ -416,7 +416,7 @@ int32_t uloc_getName(const char* localeID,
int cntSze = 0;
UErrorCode int_err = U_ZERO_ERROR;
if (FAILURE(*err)) return 0;
if (U_FAILURE(*err)) return 0;
/*First we preflight the components in order to ensure a valid return value*/
if (localeID == NULL) localeID = uloc_getDefault();
@ -453,7 +453,7 @@ int32_t uloc_getName(const char* localeID,
/*We fill in the users buffer*/
if ((nameCapacity>0) && cntSze)
{
if (SUCCESS(int_err)) icu_strcat(name, "_");
if (U_SUCCESS(int_err)) icu_strcat(name, "_");
uloc_getCountry(localeID,
name + icu_strlen(name),
@ -462,7 +462,7 @@ int32_t uloc_getName(const char* localeID,
if (varSze)
{
if (SUCCESS(int_err)) icu_strcat(name, "_");
if (U_SUCCESS(int_err)) icu_strcat(name, "_");
uloc_getVariant(localeID,
name + icu_strlen(name),
@ -484,7 +484,7 @@ const char* uloc_getISO3Language(const char* localeID)
if (localeID == NULL) localeID = uloc_getDefault();
uloc_getLanguage(localeID, lang, TEMPBUFSIZE, &err);
if (FAILURE(err)) return "";
if (U_FAILURE(err)) return "";
index = _findIndex(_languages, sizeof(_languages),lang);
if (index < 0) return "";
return &(_languages3[index * 4]);
@ -498,7 +498,7 @@ const char* uloc_getISO3Country(const char* localeID)
if (localeID == NULL) localeID = uloc_getDefault();
uloc_getCountry(localeID, cntry, TEMPBUFSIZE, &err);
if (FAILURE(err)) return "";
if (U_FAILURE(err)) return "";
index = _findIndex(_countries, sizeof(_countries), cntry);
if (index < 0) return "";
@ -513,11 +513,11 @@ uint32_t uloc_getLCID(const char* localeID)
uint32_t result = 0;
UResourceBundle* bundle = ures_open(uloc_getDataDirectory(), localeID, &err);
if (SUCCESS(err))
if (U_SUCCESS(err))
{
lcid = ures_get(bundle, _kLocaleID, &err);
ures_close(bundle);
if (FAILURE(err) || !lcid || u_strlen(lcid) == 0)
if (U_FAILURE(err) || !lcid || u_strlen(lcid) == 0)
{
return 0;
}
@ -547,7 +547,7 @@ int32_t uloc_getDisplayLanguage(const char* locale,
const char* dataDir = uloc_getDataDirectory();
bool_t done = FALSE;
if (FAILURE(*status)) return 0;
if (U_FAILURE(*status)) return 0;
if (inLocale == NULL)
{
@ -595,14 +595,14 @@ int32_t uloc_getDisplayLanguage(const char* locale,
bundle = ures_open(dataDir, inLocale, &err);
if (SUCCESS(err))
if (U_SUCCESS(err))
{
UErrorCode err = U_ZERO_ERROR;
temp = ures_getTaggedArrayItem(bundle,
_kLanguages,
inLanguageBuffer,
&err);
if (SUCCESS(err)) result = temp;
if (U_SUCCESS(err)) result = temp;
ures_close(bundle);
}
@ -672,7 +672,7 @@ int32_t uloc_getDisplayCountry(const char* locale,
const char* dataDir = uloc_getDataDirectory();
bool_t done = FALSE;
if (FAILURE(*status)) return 0;
if (U_FAILURE(*status)) return 0;
@ -720,7 +720,7 @@ int32_t uloc_getDisplayCountry(const char* locale,
bundle = ures_open(dataDir, inLocale, &err);
if (SUCCESS(err))
if (U_SUCCESS(err))
{
const UChar* temp;
@ -728,7 +728,7 @@ int32_t uloc_getDisplayCountry(const char* locale,
_kCountries,
inCountryBuffer,
&err);
if (SUCCESS(err))
if (U_SUCCESS(err))
result = temp;
ures_close(bundle);
}
@ -796,7 +796,7 @@ int32_t uloc_getDisplayVariant(const char* locale,
const char* dataDir = uloc_getDataDirectory();
bool_t done = FALSE;
if (FAILURE(*status)) return 0;
if (U_FAILURE(*status)) return 0;
inVariantTagBuffer[0] = '\0';
@ -857,14 +857,14 @@ int32_t uloc_getDisplayVariant(const char* locale,
bundle = ures_open(dataDir, inLocale, &err);
if (SUCCESS(err))
if (U_SUCCESS(err))
{
const UChar* temp;
temp = ures_get(bundle,
inVariantTag,
&err);
if (SUCCESS(err)) result = temp;
if (U_SUCCESS(err)) result = temp;
ures_close(bundle);
}
@ -982,9 +982,9 @@ int32_t uloc_getDisplayName(const char* locale,
nameCapacity,
&int_err) - 1;
if (SUCCESS(int_err)&&cntSze)
if (U_SUCCESS(int_err)&&cntSze)
{
if (SUCCESS(int_err))
if (U_SUCCESS(int_err))
{
if (has_lang)
{
@ -1001,7 +1001,7 @@ int32_t uloc_getDisplayName(const char* locale,
if (varSze)
{
if (SUCCESS(int_err))
if (U_SUCCESS(int_err))
{
u_strcat(result, comma);
result_size += 2;
@ -1014,7 +1014,7 @@ int32_t uloc_getDisplayName(const char* locale,
}
}
if (SUCCESS(int_err)&&has_lang) u_strcat(result, closeParen);
if (U_SUCCESS(int_err)&&has_lang) u_strcat(result, closeParen);
}
*err = int_err;
@ -1029,7 +1029,7 @@ int32_t uloc_getDisplayName(const char* locale,
* it contains are owned by ICU and should not be deleted or written through
* by the caller. The array is terminated by a null pointer. RTG
*/
CAPI UnicodeString** T_ResourceBundle_listInstalledLocales(const char* path, int32_t* numInstalledLocales);
U_CAPI UnicodeString** T_ResourceBundle_listInstalledLocales(const char* path, int32_t* numInstalledLocales);
const char*
uloc_getAvailable(int32_t index)

82
icu4c/source/common/uloc.h
View file

@ -95,7 +95,7 @@
* for the United States:
* <blockquote>
* <pre>
* . uloc_US
* . ULOC_US
* </pre>
* </blockquote>
*
@ -176,32 +176,32 @@
*
* Useful constants for language.
*/
#define uloc_ENGLISH "en"
#define uloc_FRENCH "fr"
#define uloc_GERMAN "de"
#define uloc_ITALIAN "it"
#define uloc_JAPANESE "ja"
#define uloc_KOREAN "ko"
#define uloc_CHINESE "zh"
#define uloc_SIMPLIFIED_CHINESE "zh_CN"
#define uloc_TRADITIONAL_CHINESE "zh_TW"
#define ULOC_ENGLISH "en"
#define ULOC_FRENCH "fr"
#define ULOC_GERMAN "de"
#define ULOC_ITALIAN "it"
#define ULOC_JAPANESE "ja"
#define ULOC_KOREAN "ko"
#define ULOC_CHINESE "zh"
#define ULOC_SIMPLIFIED_CHINESE "zh_CN"
#define ULOC_TRADITIONAL_CHINESE "zh_TW"
/**
*
* Useful constants for country.
*/
#define uloc_FRANCE "fr_FR"
#define uloc_GERMANY "de_DE"
#define uloc_ITALY "it_IT"
#define uloc_JAPAN "ja_JP"
#define uloc_KOREA "ko_KR"
#define uloc_CHINA "zh_CN"
#define uloc_PRC "zh_CN"
#define uloc_TAIWAN "zh_TW"
#define uloc_UK "en_GB"
#define uloc_US "en_US"
#define uloc_CANADA "en_CA"
#define uloc_CANADA_FRENCH "fr_CA"
#define ULOC_FRANCE "fr_FR"
#define ULOC_GERMANY "de_DE"
#define ULOC_ITALY "it_IT"
#define ULOC_JAPAN "ja_JP"
#define ULOC_KOREA "ko_KR"
#define ULOC_CHINA "zh_CN"
#define ULOC_PRC "zh_CN"
#define ULOC_TAIWAN "zh_TW"
#define ULOC_UK "en_GB"
#define ULOC_US "en_US"
#define ULOC_CANADA "en_CA"
#define ULOC_CANADA_FRENCH "fr_CA"
@ -212,7 +212,7 @@
* @return the system default locale
*/
CAPI const char* U_EXPORT2
U_CAPI const char* U_EXPORT2
uloc_getDefault(void);
/**
@ -221,7 +221,7 @@ uloc_getDefault(void);
* @param localeID the new system default locale
* @param status the error information if the setting of default locale fails
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
uloc_setDefault(const char* localeID,
UErrorCode* status);
@ -237,7 +237,7 @@ uloc_setDefault(const char* localeID,
* than languageCapacity, the returned language code will be truncated.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uloc_getLanguage(const char* localeID,
char* language,
int32_t languageCapacity,
@ -255,7 +255,7 @@ uloc_getLanguage(const char* localeID,
* than countryCapacity, the returned country code will be truncated.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uloc_getCountry(const char* localeID,
char* country,
int32_t countryCapacity,
@ -273,7 +273,7 @@ uloc_getCountry(const char* localeID,
* than variantCapacity, the returned variant code will be truncated.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uloc_getVariant(const char* localeID,
char* variant,
int32_t variantCapacity,
@ -290,7 +290,7 @@ uloc_getVariant(const char* localeID,
* than nameCapacity, the returned full name will be truncated.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uloc_getName(const char* localeID,
char* name,
int32_t nameCapacity,
@ -302,7 +302,7 @@ uloc_getName(const char* localeID,
* @param localeID the locale to get the ISO langauge code with
* @return language the ISO langauge code for localeID
*/
CAPI const char* U_EXPORT2
U_CAPI const char* U_EXPORT2
uloc_getISO3Language(const char* localeID);
@ -313,7 +313,7 @@ uloc_getISO3Language(const char* localeID);
* @return country the ISO country code for localeID
*/
CAPI const char* U_EXPORT2
U_CAPI const char* U_EXPORT2
uloc_getISO3Country(const char* localeID);
/**
@ -323,7 +323,7 @@ uloc_getISO3Country(const char* localeID);
* @return country the Win32 LCID for localeID
*/
CAPI uint32_t U_EXPORT2
U_CAPI uint32_t U_EXPORT2
uloc_getLCID(const char* localeID);
/**
@ -337,7 +337,7 @@ uloc_getLCID(const char* localeID);
* @return the actual buffer size needed for the displayable langauge code. If it's greater
* than languageCapacity, the returned language code will be truncated.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uloc_getDisplayLanguage(const char* locale,
const char* inLocale,
UChar* language,
@ -356,7 +356,7 @@ uloc_getDisplayLanguage(const char* locale,
* than countryCapacity, the returned displayable country code will be truncated.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uloc_getDisplayCountry(const char* locale,
const char* inLocale,
UChar* country,
@ -376,7 +376,7 @@ uloc_getDisplayCountry(const char* locale,
* than variantCapacity, the returned displayable variant code will be truncated.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uloc_getDisplayVariant(const char* locale,
const char* inLocale,
UChar* variant,
@ -395,7 +395,7 @@ uloc_getDisplayVariant(const char* locale,
* than variantCapacity, the returned displayable name will be truncated.
*/
CAPI int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
uloc_getDisplayName(const char* localeID,
const char* inLocaleID, /* NULL may be used to specify the default */
UChar* result,
@ -413,7 +413,7 @@ uloc_getDisplayName(const char* localeID,
* @param index the specific locale name index of the available locale list
* @return a specified locale name of all available locales
*/
CAPI const char* U_EXPORT2
U_CAPI const char* U_EXPORT2
uloc_getAvailable(int32_t index);
/**
@ -421,7 +421,7 @@ uloc_getAvailable(int32_t index);
* Gets the size of the all available locale list.
* @return the size of the locale list
*/
CAPI int32_t U_EXPORT2 uloc_countAvailable(void);
U_CAPI int32_t U_EXPORT2 uloc_countAvailable(void);
/**
*
@ -431,7 +431,7 @@ CAPI int32_t U_EXPORT2 uloc_countAvailable(void);
* terminated with a null pointer.
* @return a list of all available language codes
*/
CAPI const char* const* U_EXPORT2
U_CAPI const char* const* U_EXPORT2
uloc_getISOLanguages(void);
/**
@ -442,7 +442,7 @@ uloc_getISOLanguages(void);
* terminated with a null pointer.
* @return a list of all available country codes
*/
CAPI const char* const* U_EXPORT2
U_CAPI const char* const* U_EXPORT2
uloc_getISOCountries(void);
/**
@ -450,7 +450,7 @@ uloc_getISOCountries(void);
* Gets the directory containing the locale data files.
* @return the locale data file directory
*/
CAPI const char* U_EXPORT2
U_CAPI const char* U_EXPORT2
uloc_getDataDirectory(void);
/**
@ -459,7 +459,7 @@ uloc_getDataDirectory(void);
* @return the new directory to fetch locale data from
*/
CAPI void U_EXPORT2
U_CAPI void U_EXPORT2
uloc_setDataDirectory(const char* newDirectory);
/*Internal function */

2
icu4c/source/common/umutex.c
View file

@ -126,7 +126,7 @@ void umtx_unlock( UMTX* mutex )
#endif /* APP_NO_THREADS not defined */
}
CAPI void umtx_init( UMTX *mutex )
U_CAPI void umtx_init( UMTX *mutex )
{
#ifndef APP_NO_THREADS

8
icu4c/source/common/unistr.cpp
View file

@ -772,7 +772,7 @@ UnicodeString::extract(UTextOffset start,
converter = ucnv_open(codepage, &status);
// if we failed, set the appropriate flags and return
if(FAILURE(status)) {
if(U_FAILURE(status)) {
// close the converter
if(codepage == 0)
releaseDefaultConverter(converter);
@ -822,7 +822,7 @@ UnicodeString::doCodepageCreate(const char *codepageData,
: ucnv_open(codepage, &status));
// if we failed, set the appropriate flags and return
if(FAILURE(status)) {
if(U_FAILURE(status)) {
// close the converter
if(codepage == 0)
releaseDefaultConverter(converter);
@ -1016,7 +1016,7 @@ UnicodeString::cloneArrayIfNeeded()
}
// private function for C API
C_FUNC const UChar*
U_CFUNC const UChar*
T_UnicodeString_getUChars(const UnicodeString *s)
{
return s->getUChars();
@ -1045,7 +1045,7 @@ UnicodeString::getDefaultConverter(UErrorCode &status)
// if the cache was empty, create a converter
if(converter == 0) {
converter = ucnv_open(0, &status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
}

34
icu4c/source/common/ures.cpp
View file

@ -30,7 +30,7 @@
* Functions to create and destroy resource bundles.
*/
CAPI UResourceBundle* ures_open( const char* myPath,
U_CAPI UResourceBundle* ures_open( const char* myPath,
const char* localeID,
UErrorCode* status)
{
@ -47,7 +47,7 @@ CAPI UResourceBundle* ures_open( const char* myPath,
return (UResourceBundle*) new ResourceBundle(uPath, myLocale.init(localeID), *status);
}
CAPI UResourceBundle* ures_openW( const wchar_t* myPath,
U_CAPI UResourceBundle* ures_openW( const wchar_t* myPath,
const char* localeID,
UErrorCode* status)
{
@ -62,11 +62,11 @@ CAPI UResourceBundle* ures_openW( const wchar_t* myPath,
* Functions to retrieve data from resource bundles.
*/
CAPI const UChar* ures_get( const UResourceBundle* resourceBundle,
U_CAPI const UChar* ures_get( const UResourceBundle* resourceBundle,
const char* resourceTag,
UErrorCode* status)
{
if (FAILURE(*status)) return NULL;
if (U_FAILURE(*status)) return NULL;
if (!resourceBundle || !resourceTag)
{
*status = U_ILLEGAL_ARGUMENT_ERROR;
@ -75,16 +75,16 @@ CAPI const UChar* ures_get( const UResourceBundle* resourceBundle,
const UnicodeString* tmp = ((ResourceBundle*)resourceBundle)->getString(resourceTag, *status);
if (SUCCESS(*status)) return tmp->getUChars();
if (U_SUCCESS(*status)) return tmp->getUChars();
else return NULL;
}
CAPI const UChar* ures_getArrayItem(const UResourceBundle* resourceBundle,
U_CAPI const UChar* ures_getArrayItem(const UResourceBundle* resourceBundle,
const char* resourceTag,
int32_t resourceIndex,
UErrorCode* status)
{
if (FAILURE(*status)) return NULL;
if (U_FAILURE(*status)) return NULL;
if (!resourceBundle || !resourceTag || (resourceIndex < 0))
{
*status = U_ILLEGAL_ARGUMENT_ERROR;
@ -93,19 +93,19 @@ CAPI const UChar* ures_getArrayItem(const UResourceBundle* resourceBundle,
const UnicodeString* tmp = ((ResourceBundle*)resourceBundle)->getArrayItem(resourceTag, resourceIndex, *status);
if (SUCCESS(*status)) return tmp->getUChars();
if (U_SUCCESS(*status)) return tmp->getUChars();
else return NULL;
}
CAPI const UChar* ures_get2dArrayItem(const UResourceBundle* resourceBundle,
U_CAPI const UChar* ures_get2dArrayItem(const UResourceBundle* resourceBundle,
const char* resourceTag,
int32_t rowIndex,
int32_t columnIndex,
UErrorCode* status)
{
if (FAILURE(*status)) return NULL;
if (U_FAILURE(*status)) return NULL;
if (!resourceBundle || !resourceTag || (rowIndex < 0) || (columnIndex < 0))
{
*status = U_ILLEGAL_ARGUMENT_ERROR;
@ -116,16 +116,16 @@ CAPI const UChar* ures_get2dArrayItem(const UResourceBundle* resourceBundle,
rowIndex,
columnIndex,
*status);
if (SUCCESS(*status)) return tmp->getUChars();
if (U_SUCCESS(*status)) return tmp->getUChars();
else return NULL;
}
CAPI const UChar* ures_getTaggedArrayItem(const UResourceBundle* resourceBundle,
U_CAPI const UChar* ures_getTaggedArrayItem(const UResourceBundle* resourceBundle,
const char* resourceTag,
const char* itemTag,
UErrorCode* status)
{
if (FAILURE(*status)) return NULL;
if (U_FAILURE(*status)) return NULL;
if (!resourceBundle || !resourceTag || !itemTag)
{
*status = U_ILLEGAL_ARGUMENT_ERROR;
@ -135,12 +135,12 @@ CAPI const UChar* ures_getTaggedArrayItem(const UResourceBundle* resourceBundl
const UnicodeString* tmp = ((ResourceBundle*)resourceBundle)->getTaggedArrayItem(resourceTag,
itemTag,
*status);
if (SUCCESS(*status)) return tmp->getUChars();
if (U_SUCCESS(*status)) return tmp->getUChars();
else return NULL;
}
CAPI const char* ures_getVersionNumber(const UResourceBundle* resourceBundle)
U_CAPI const char* ures_getVersionNumber(const UResourceBundle* resourceBundle)
{
if (!resourceBundle) return NULL;
return ((ResourceBundle*)resourceBundle)->getVersionNumber();
@ -150,7 +150,7 @@ extern "C" int32_t T_ResourceBundle_countArrayItems(const ResourceBundle* rb,
const char* resourceKey,
UErrorCode* err);
CAPI int32_t ures_countArrayItems(const UResourceBundle* resourceBundle,
U_CAPI int32_t ures_countArrayItems(const UResourceBundle* resourceBundle,
const char* resourceKey,
UErrorCode* err)
{
@ -159,7 +159,7 @@ CAPI int32_t ures_countArrayItems(const UResourceBundle* resourceBundle,
err);
}
CAPI void ures_close( UResourceBundle* resourceBundle)
U_CAPI void ures_close( UResourceBundle* resourceBundle)
{
delete resourceBundle;
return;

20
icu4c/source/common/ures.h
View file

@ -140,7 +140,7 @@ typedef void* UResourceBundle;
*@param status : fills in the outgoing error code.
* The UErrorCode err parameter is used to return status information to the user. To
* check whether the construction succeeded or not, you should check the value of
* SUCCESS(err). If you wish more detailed information, you can check for
* U_SUCCESS(err). If you wish more detailed information, you can check for
* informational error results which still indicate success. U_USING_FALLBACK_ERROR
* indicates that a fall back locale was used. For example, 'de_CH' was requested,
* but nothing was found there, so 'de' was used. U_USING_DEFAULT_ERROR indicates that
@ -149,7 +149,7 @@ typedef void* UResourceBundle;
*@return : a newly allocated resource bundle.
*@see ures_close
*/
CAPI UResourceBundle* U_EXPORT2 ures_open(const char* path, /* NULL if none */
U_CAPI UResourceBundle* U_EXPORT2 ures_open(const char* path, /* NULL if none */
const char* locale, /* NULL if none */
UErrorCode* status);
@ -172,7 +172,7 @@ CAPI UResourceBundle* U_EXPORT2 ures_open(const char* path, /* NULL if non
*@see ures_close
*@return : a newly allocated resource bundle.
*/
CAPI UResourceBundle* U_EXPORT2 ures_openW(const wchar_t* path,
U_CAPI UResourceBundle* U_EXPORT2 ures_openW(const wchar_t* path,
const char* locale,
UErrorCode* status);
@ -191,7 +191,7 @@ CAPI UResourceBundle* U_EXPORT2 ures_openW(const wchar_t* path,
*@see ures_get2dArrayItem
*@see ures_getTaggedItem
*/
CAPI const UChar* U_EXPORT2 ures_get(const UResourceBundle* resourceBundle,
U_CAPI const UChar* U_EXPORT2 ures_get(const UResourceBundle* resourceBundle,
const char* resourceTag,
UErrorCode* status);
@ -211,7 +211,7 @@ CAPI const UChar* U_EXPORT2 ures_get(const UResourceBundle* resourceBundle,
*@see ures_get2dArrayItem
*@see ures_getTaggedItem
*/
CAPI const UChar* U_EXPORT2 ures_getArrayItem(const UResourceBundle* resourceBundle,
U_CAPI const UChar* U_EXPORT2 ures_getArrayItem(const UResourceBundle* resourceBundle,
const char* resourceTag,
int32_t resourceIndex,
UErrorCode* status);
@ -234,7 +234,7 @@ CAPI const UChar* U_EXPORT2 ures_getArrayItem(const UResourceBundle* resourc
*@see ures_getTaggedItem
*/
CAPI const UChar* U_EXPORT2 ures_get2dArrayItem(const UResourceBundle* resourceBundle,
U_CAPI const UChar* U_EXPORT2 ures_get2dArrayItem(const UResourceBundle* resourceBundle,
const char* resourceTag,
int32_t rowIndex,
int32_t columnIndex,
@ -257,7 +257,7 @@ CAPI const UChar* U_EXPORT2 ures_get2dArrayItem(const UResourceBundle* resourc
*@see ures_get2dItem
*/
CAPI const UChar* U_EXPORT2 ures_getTaggedArrayItem(const UResourceBundle* resourceBundle,
U_CAPI const UChar* U_EXPORT2 ures_getTaggedArrayItem(const UResourceBundle* resourceBundle,
const char* resourceTag,
const char* itemTag,
UErrorCode* status);
@ -283,7 +283,7 @@ CAPI const UChar* U_EXPORT2 ures_getTaggedArrayItem(const UResourceBundle* res
*@see ures_get2dArrayItem
*/
CAPI int32_t U_EXPORT2 ures_countArrayItems(const UResourceBundle* resourceBundle,
U_CAPI int32_t U_EXPORT2 ures_countArrayItems(const UResourceBundle* resourceBundle,
const char* resourceKey,
UErrorCode* err);
/**
@ -297,7 +297,7 @@ CAPI int32_t U_EXPORT2 ures_countArrayItems(const UResourceBundle* resourceBundl
* @see ures_open
* @see ures_openW
*/
CAPI void U_EXPORT2 ures_close(UResourceBundle* resourceBundle);
U_CAPI void U_EXPORT2 ures_close(UResourceBundle* resourceBundle);
/**
* Return the version number associated with this ResourceBundle. This version
* number is a string of the form MAJOR.MINOR, where MAJOR is the version number of
@ -316,6 +316,6 @@ CAPI void U_EXPORT2 ures_close(UResourceBundle* resourceBundle);
* representing the resource data file. The caller does not own this
* string.
*/
CAPI const char* U_EXPORT2 ures_getVersionNumber(const UResourceBundle* resourceBundle);
U_CAPI const char* U_EXPORT2 ures_getVersionNumber(const UResourceBundle* resourceBundle);
#endif /*_URES*/
/*eof*/

46
icu4c/source/common/utypes.h
View file

@ -14,7 +14,7 @@
*
* Date Name Description
* 12/11/96 helena Creation.
* 02/27/97 aliu Added typedefs for ClassID, int8, int16, int32,
* 02/27/97 aliu Added typedefs for UClassID, int8, int16, int32,
* uint8, uint16, and uint32.
* 04/01/97 aliu Added XP_CPLUSPLUS and modified to work under C as
* well as C++.
@ -112,17 +112,17 @@ typedef uint16_t UChar;
/*===========================================================================*/
/* For C wrappers, we use the symbol CAPI. */
/* For C wrappers, we use the symbol U_CAPI. */
/* This works properly if the includer is C or C++. */
/* Functions are declared CAPI return-type U_EXPORT2 function-name() ... */
/* Functions are declared U_CAPI return-type U_EXPORT2 function-name() ... */
/*===========================================================================*/
#ifdef XP_CPLUSPLUS
# define C_FUNC extern "C"
# define U_CFUNC extern "C"
#else
# define C_FUNC
# define U_CFUNC
#endif
#define CAPI C_FUNC U_EXPORT
#define U_CAPI U_CFUNC U_EXPORT
/* Define NULL pointer value if it isn't already defined */
@ -149,21 +149,21 @@ typedef uint16_t UChar;
typedef double UDate;
/* Common time manipulation constants */
#define kMillisPerSecond (1000)
#define kMillisPerMinute (60000)
#define kMillisPerHour (3600000)
#define kMillisPerDay (86400000)
#define U_MILLIS_PER_SECOND (1000)
#define U_MILLIS_PER_MINUTE (60000)
#define U_MILLIS_PER_HOUR (3600000)
#define U_MILLIS_PER_DAY (86400000)
/*===========================================================================*/
/* ClassID-based RTTI */
/* UClassID-based RTTI */
/*===========================================================================*/
/**
* ClassID is used to identify classes without using RTTI, since RTTI
* UClassID is used to identify classes without using RTTI, since RTTI
* is not yet supported by all C++ compilers. Each class hierarchy which needs
* to implement polymorphic clone() or operator==() defines two methods,
* described in detail below. ClassID values can be compared using
* described in detail below. UClassID values can be compared using
* operator==(). Nothing else should be done with them.
*
* getDynamicClassID() is declared in the base class of the hierarchy as
@ -171,12 +171,12 @@ typedef double UDate;
*
* class Base {
* public:
* virtual ClassID getDynamicClassID() const = 0;
* virtual UClassID getDynamicClassID() const = 0;
* }
*
* class Derived {
* public:
* virtual ClassID getDynamicClassID() const
* virtual UClassID getDynamicClassID() const
* { return Derived::getStaticClassID(); }
* }
*
@ -185,18 +185,18 @@ typedef double UDate;
*
* class Derived {
* public:
* static ClassID getStaticClassID();
* static UClassID getStaticClassID();
* private:
* static char fgClassID;
* }
*
* // In Derived.cpp:
* ClassID Derived::getStaticClassID()
* { return (ClassID)&Derived::fgClassID; }
* UClassID Derived::getStaticClassID()
* { return (UClassID)&Derived::fgClassID; }
* char Derived::fgClassID = 0; // Value is irrelevant
*/
typedef void* ClassID;
typedef void* UClassID;
/*===========================================================================*/
/* Shared library/DLL import-export API control */
@ -257,11 +257,11 @@ typedef enum UErrorCode UErrorCode;
/* Use the following to determine if an UErrorCode represents */
/* operational success or failure. */
#ifdef XP_CPLUSPLUS
inline bool_t SUCCESS(UErrorCode code) { return (bool_t)(code<=U_ZERO_ERROR); }
inline bool_t FAILURE(UErrorCode code) { return (bool_t)(code>U_ZERO_ERROR); }
inline bool_t U_SUCCESS(UErrorCode code) { return (bool_t)(code<=U_ZERO_ERROR); }
inline bool_t U_FAILURE(UErrorCode code) { return (bool_t)(code>U_ZERO_ERROR); }
#else
#define SUCCESS(x) ((x)<=U_ZERO_ERROR)
#define FAILURE(x) ((x)>U_ZERO_ERROR)
#define U_SUCCESS(x) ((x)<=U_ZERO_ERROR)
#define U_FAILURE(x) ((x)>U_ZERO_ERROR)
#endif

8
icu4c/source/extra/ustdio/locbund.c
View file

@ -123,7 +123,7 @@ u_locbund_getNumberFormat(ULocaleBundle *bundle)
if(bundle->fNumberFormat == 0) {
bundle->fNumberFormat = unum_open(UNUM_DEFAULT, bundle->fLocale, &status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
}
@ -137,7 +137,7 @@ u_locbund_getPercentFormat(ULocaleBundle *bundle)
if(bundle->fPercentFormat == 0) {
bundle->fPercentFormat = unum_open(UNUM_PERCENT, bundle->fLocale, &status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
}
@ -152,7 +152,7 @@ u_locbund_getCurrencyFormat(ULocaleBundle *bundle)
if(bundle->fCurrencyFormat == 0) {
bundle->fCurrencyFormat = unum_open(UNUM_CURRENCY, bundle->fLocale,
&status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
}
@ -174,7 +174,7 @@ u_locbund_getScientificFormat(ULocaleBundle *bundle)
bundle->fScientificFormat = unum_openPattern(pattern, -1,
bundle->fLocale, &status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
}

2
icu4c/source/extra/ustdio/loccache.c
View file

@ -51,7 +51,7 @@ u_loccache_get(const char *loc)
locCount = uloc_countAvailable();
tempCache = uhash_openSize(u_locbund_hash, locCount, &status);
if(FAILURE(status)) return 0;
if(U_FAILURE(status)) return 0;
/* Lock the cache */
umtx_lock(0);

8
icu4c/source/extra/ustdio/ufile.c
View file

@ -169,7 +169,7 @@ u_fopen(const char *filename,
codepage = 0;
result->fConverter = ucnv_open(codepage, &status);
if(FAILURE(status) || result->fConverter == 0) {
if(U_FAILURE(status) || result->fConverter == 0) {
fclose(result->fFile);
free(result);
return 0;
@ -219,7 +219,7 @@ u_finit(FILE *f,
codepage = 0;
result->fConverter = ucnv_open(codepage, &status);
if(FAILURE(status) || result->fConverter == 0) {
if(U_FAILURE(status) || result->fConverter == 0) {
fclose(result->fFile);
free(result);
return 0;
@ -274,7 +274,7 @@ u_fgetcodepage(UFILE *file)
const char *codepage;
codepage = ucnv_getName(file->fConverter, &status);
if(FAILURE(status)) return 0;
if(U_FAILURE(status)) return 0;
return codepage;
}
@ -293,7 +293,7 @@ u_fsetcodepage( const char *codepage,
ucnv_close(file->fConverter);
file->fConverter = ucnv_open(codepage, &status);
if(FAILURE(status))
if(U_FAILURE(status))
return -1;
return 0;
}

4
icu4c/source/extra/ustdio/ufmt_cmn.c
View file

@ -139,7 +139,7 @@ ufmt_defaultCPToUnicode(const char *s,
UErrorCode status = U_ZERO_ERROR;
defConverter = ucnv_open(ucnv_getDefaultName(), &status);
if(FAILURE(status) || defConverter == 0)
if(U_FAILURE(status) || defConverter == 0)
return 0;
/* perform the conversion in one swoop */
@ -173,7 +173,7 @@ ufmt_unicodeToDefaultCP(const UChar *s,
UErrorCode status = U_ZERO_ERROR;
defConverter = ucnv_open(ucnv_getDefaultName(), &status);
if(FAILURE(status) || defConverter == 0)
if(U_FAILURE(status) || defConverter == 0)
return 0;
/* perform the conversion in one swoop */

8
icu4c/source/extra/ustdio/uscanf.c
View file

@ -194,7 +194,7 @@ u_scanf_string_handler(UFILE *stream,
/* open the default converter */
conv = ucnv_open(ucnv_getDefaultName(), &status);
if(FAILURE(status))
if(U_FAILURE(status))
return -1;
/* since there is no real limit, just use a reasonable value */
@ -211,7 +211,7 @@ u_scanf_string_handler(UFILE *stream,
ucnv_fromUnicode(conv, &alias, limit, &source, source + 1,
NULL, TRUE, &status);
if(FAILURE(status))
if(U_FAILURE(status))
return -1;
/* increment the count */
@ -1198,7 +1198,7 @@ u_scanf_scanset_handler(UFILE *stream,
conv = ucnv_open(ucnv_getDefaultName(), &status);
/* verify that the parse was successful and the converter opened */
if(! success || FAILURE(status))
if(! success || U_FAILURE(status))
return -1;
/* grab characters one at a time and make sure they are in the scanset */
@ -1209,7 +1209,7 @@ u_scanf_scanset_handler(UFILE *stream,
ucnv_fromUnicode(conv, &alias, limit, &source, source + 1,
NULL, TRUE, &status);
if(FAILURE(status))
if(U_FAILURE(status))
return -1;
}
/* if the character's not in the scanset, break out */

48
icu4c/source/extra/ustdio/ustdio.h
View file

@ -53,7 +53,7 @@ typedef struct UFILE UFILE;
* is NULL, in which case the system default codepage will be used.
* @return A new UFILE, or 0 if an error occurred.
*/
CAPI UFILE*
U_CAPI UFILE*
u_fopen(const char *filename,
const char *perm,
const char *locale,
@ -71,7 +71,7 @@ u_fopen(const char *filename,
* is NULL, in which case the system default codepage will be used.
* @return A new UFILE, or 0 if an error occurred.
*/
CAPI UFILE*
U_CAPI UFILE*
u_finit(FILE *f,
const char *locale,
const char *codepage);
@ -80,7 +80,7 @@ u_finit(FILE *f,
* Close a UFILE.
* @param file The UFILE to close.
*/
CAPI void
U_CAPI void
u_fclose(UFILE *file);
/**
@ -88,7 +88,7 @@ u_fclose(UFILE *file);
* @param f The UFILE
* @return A FILE*, owned by the UFILE. The FILE <EM>must not</EM> be closed.
*/
CAPI FILE*
U_CAPI FILE*
u_fgetfile(UFILE *f);
/**
@ -98,7 +98,7 @@ u_fgetfile(UFILE *f);
* @param file The UFILE to set.
* @return The locale whose conventions are used to format and parse output.
*/
CAPI const char*
U_CAPI const char*
u_fgetlocale(UFILE *file);
/**
@ -108,7 +108,7 @@ u_fgetlocale(UFILE *file);
* @param file The UFILE to query.
* @return 0 if successful, otherwise a negative number.
*/
CAPI int32_t
U_CAPI int32_t
u_fsetlocale(const char *locale,
UFILE *file);
@ -120,7 +120,7 @@ u_fsetlocale(const char *locale,
* @return The codepage in which data is written to and read from the UFILE,
* or 0 if an error occurred.
*/
CAPI const char*
U_CAPI const char*
u_fgetcodepage(UFILE *file);
/**
@ -134,7 +134,7 @@ u_fgetcodepage(UFILE *file);
* @param file The UFILE to set.
* @return 0 if successful, otherwise a negative number.
*/
CAPI int32_t
U_CAPI int32_t
u_fsetcodepage(const char *codepage,
UFILE *file);
@ -144,7 +144,7 @@ u_fsetcodepage(const char *codepage,
* @param file The UFILE to set.
* @return alias to the converter
*/
CAPI UConverter *u_fgetConverter(UFILE *f);
U_CAPI UConverter *u_fgetConverter(UFILE *f);
/* Output functions */
@ -155,7 +155,7 @@ CAPI UConverter *u_fgetConverter(UFILE *f);
* interpret the variable arguments received and format the data.
* @return The number of Unicode characters written to <TT>f</TT>.
*/
CAPI int32_t
U_CAPI int32_t
u_fprintf( UFILE *f,
const char *patternSpecification,
... );
@ -171,7 +171,7 @@ u_fprintf( UFILE *f,
* @return The number of Unicode characters written to <TT>f</TT>.
* @see u_fprintf
*/
CAPI int32_t
U_CAPI int32_t
u_vfprintf( UFILE *f,
const char *patternSpecification,
va_list ap);
@ -183,7 +183,7 @@ u_vfprintf( UFILE *f,
* interpret the variable arguments received and format the data.
* @return The number of Unicode characters written to <TT>f</TT>.
*/
CAPI int32_t
U_CAPI int32_t
u_fprintf_u( UFILE *f,
const UChar *patternSpecification,
... );
@ -199,7 +199,7 @@ u_fprintf_u( UFILE *f,
* @return The number of Unicode characters written to <TT>f</TT>.
* @see u_fprintf_u
*/
CAPI int32_t
U_CAPI int32_t
u_vfprintf_u( UFILE *f,
const UChar *patternSpecification,
va_list ap);
@ -212,7 +212,7 @@ u_vfprintf_u( UFILE *f,
* @param f The UFILE to which to write.
* @return A non-negative number if successful, EOF otherwise.
*/
CAPI int32_t
U_CAPI int32_t
u_fputs(const UChar *s,
UFILE *f);
@ -222,7 +222,7 @@ u_fputs(const UChar *s,
* @param f The UFILE to which to write.
* @return The character written if successful, EOF otherwise.
*/
CAPI int32_t
U_CAPI int32_t
u_fputc(UChar uc,
UFILE *f);
@ -235,7 +235,7 @@ u_fputc(UChar uc,
* @param f The UFILE to which to write.
* @return The number of Unicode characters written.
*/
CAPI int32_t
U_CAPI int32_t
u_file_write(const UChar *chars,
int32_t count,
UFILE *f);
@ -251,7 +251,7 @@ u_file_write(const UChar *chars,
* @return The number of items successfully converted and assigned, or EOF
* if an error occurred.
*/
CAPI int32_t
U_CAPI int32_t
u_fscanf( UFILE *f,
const char *patternSpecification,
... );
@ -268,7 +268,7 @@ u_fscanf( UFILE *f,
* if an error occurred.
* @see u_fscanf
*/
CAPI int32_t
U_CAPI int32_t
u_vfscanf( UFILE *f,
const char *patternSpecification,
va_list ap);
@ -281,7 +281,7 @@ u_vfscanf( UFILE *f,
* @return The number of items successfully converted and assigned, or EOF
* if an error occurred.
*/
CAPI int32_t
U_CAPI int32_t
u_fscanf_u( UFILE *f,
const UChar *patternSpecification,
... );
@ -298,7 +298,7 @@ u_fscanf_u( UFILE *f,
* if an error occurred.
* @see u_fscanf_u
*/
CAPI int32_t
U_CAPI int32_t
u_vfscanf_u( UFILE *f,
const UChar *patternSpecification,
va_list ap);
@ -312,7 +312,7 @@ u_vfscanf_u( UFILE *f,
* reached. A NULL character (U+0000) will be appended to <TT>s</TT>.
* @return A pointer to <TT>s</TT>, or 0 if no characters were available.
*/
CAPI UChar*
U_CAPI UChar*
u_fgets(UFILE *f,
int32_t n,
UChar *s);
@ -322,7 +322,7 @@ u_fgets(UFILE *f,
* @param f The UFILE from which to read.
* @return The UChar value read, or U+FFFF if no character was available.
*/
CAPI UChar
U_CAPI UChar
u_fgetc(UFILE *f);
/**
@ -333,7 +333,7 @@ u_fgetc(UFILE *f);
* @param f The UFILE to receive <TT>c</TT>.
* @return The UChar value put back if successful, U+FFFF otherwise.
*/
CAPI UChar
U_CAPI UChar
u_fungetc(UChar c,
UFILE *f);
@ -346,7 +346,7 @@ u_fungetc(UChar c,
* @param f The UFILE from which to read.
* @return The number of Unicode characters read.
*/
CAPI int32_t
U_CAPI int32_t
u_file_read(UChar *chars,
int32_t count,
UFILE *f);

40
icu4c/source/i18n/calendar.cpp
View file

@ -186,10 +186,10 @@ Calendar::operator=(const Calendar &right)
Calendar*
Calendar::createInstance(UErrorCode& success)
{
if (FAILURE(success)) return 0;
if (U_FAILURE(success)) return 0;
// right now, createInstance will always return an instance of GregorianCalendar
Calendar* c = new GregorianCalendar(success);
if (FAILURE(success)) { delete c; c = 0; }
if (U_FAILURE(success)) { delete c; c = 0; }
return c;
}
@ -198,10 +198,10 @@ Calendar::createInstance(UErrorCode& success)
Calendar*
Calendar::createInstance(const TimeZone& zone, UErrorCode& success)
{
if (FAILURE(success)) return 0;
if (U_FAILURE(success)) return 0;
// since the Locale isn't specified, use the default locale
Calendar* c = new GregorianCalendar(zone, Locale::getDefault(), success);
if (FAILURE(success)) { delete c; c = 0; }
if (U_FAILURE(success)) { delete c; c = 0; }
return c;
}
@ -210,10 +210,10 @@ Calendar::createInstance(const TimeZone& zone, UErrorCode& success)
Calendar*
Calendar::createInstance(const Locale& aLocale, UErrorCode& success)
{
if (FAILURE(success)) return 0;
if (U_FAILURE(success)) return 0;
// since the TimeZone isn't specfied, use the default time zone
Calendar* c = new GregorianCalendar(TimeZone::createDefault(), aLocale, success);
if (FAILURE(success)) { delete c; c = 0; }
if (U_FAILURE(success)) { delete c; c = 0; }
return c;
}
@ -222,7 +222,7 @@ Calendar::createInstance(const Locale& aLocale, UErrorCode& success)
Calendar*
Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& success)
{
if (FAILURE(success)) {
if (U_FAILURE(success)) {
delete zone;
return 0;
}
@ -230,7 +230,7 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
if (c == 0) {
success = U_MEMORY_ALLOCATION_ERROR;
delete zone;
} else if (FAILURE(success)) {
} else if (U_FAILURE(success)) {
delete c;
c = 0;
}
@ -242,9 +242,9 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
Calendar*
Calendar::createInstance(const TimeZone& zone, const Locale& aLocale, UErrorCode& success)
{
if (FAILURE(success)) return 0;
if (U_FAILURE(success)) return 0;
Calendar* c = new GregorianCalendar(zone, aLocale, success);
if (FAILURE(success)) { delete c; c = 0; }
if (U_FAILURE(success)) { delete c; c = 0; }
return c;
}
@ -343,7 +343,7 @@ Calendar::getAvailableLocales(int32_t& count)
UDate
Calendar::getNow()
{
return (UDate)icu_getUTCtime() * kMillisPerSecond; // return as milliseconds
return (UDate)icu_getUTCtime() * U_MILLIS_PER_SECOND; // return as milliseconds
}
// -------------------------------------
@ -355,7 +355,7 @@ Calendar::getNow()
double
Calendar::getTimeInMillis(UErrorCode& status) const
{
if(FAILURE(status))
if(U_FAILURE(status))
return 0.0;
if ( ! fIsTimeSet)
@ -371,7 +371,7 @@ Calendar::getTimeInMillis(UErrorCode& status) const
*/
void
Calendar::setTimeInMillis( double millis, UErrorCode& status ) {
if(FAILURE(status))
if(U_FAILURE(status))
return;
fIsTimeSet = TRUE;
@ -392,8 +392,8 @@ Calendar::get(EDateFields field, UErrorCode& status) const
// field values are only computed when actually requested; for more on when computation
// of various things happens, see the "data flow in Calendar" description at the top
// of this file
if (SUCCESS(status)) ((Calendar*)this)->complete(status); // Cast away const
return SUCCESS(status) ? fFields[field] : 0;
if (U_SUCCESS(status)) ((Calendar*)this)->complete(status); // Cast away const
return U_SUCCESS(status) ? fFields[field] : 0;
}
// -------------------------------------
@ -675,7 +675,7 @@ int32_t Calendar::stringToDayNumber(const UnicodeString& string, UErrorCode& sta
// of the characters in the string, or if the value is not in the range
// 1..7. (This is used to read the week-count data from the resource files;
// ResourceBundle returns all data in string form, so we have to convert it here.)
if (FAILURE(status)) return 0;
if (U_FAILURE(status)) return 0;
int32_t len = string.size();
char *number = new char[1 + len];
@ -710,12 +710,12 @@ Calendar::setWeekCountData(const Locale& desiredLocale, UErrorCode& status)
const UnicodeString *dateTimeElements;
int32_t count;
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
ResourceBundle resource(Locale::getDataDirectory(), desiredLocale, status);
// If the resource data doesn't seem to be present at all, then use last-resort
// hard-coded data.
if (FAILURE(status))
if (U_FAILURE(status))
{
status = U_USING_FALLBACK_ERROR;
fFirstDayOfWeek = Calendar::SUNDAY;
@ -724,7 +724,7 @@ Calendar::setWeekCountData(const Locale& desiredLocale, UErrorCode& status)
}
dateTimeElements = resource.getStringArray(kDateTimeElements, count, status);
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
if (count != 2)
{
status = U_INVALID_FORMAT_ERROR;
@ -744,7 +744,7 @@ void
Calendar::updateTime(UErrorCode& status)
{
computeTime(status);
if(FAILURE(status))
if(U_FAILURE(status))
return;
// If we are lenient, we need to recompute the fields to normalize

8
icu4c/source/i18n/calendar.h
View file

@ -166,8 +166,8 @@ public:
MINUTE, // Example: 0..59
SECOND, // Example: 0..59
MILLISECOND, // Example: 0..999
ZONE_OFFSET, // Example: -12*kMillisPerHour..12*kMillisPerHour
DST_OFFSET, // Example: 0 or kMillisPerHour
ZONE_OFFSET, // Example: -12*U_MILLIS_PER_HOUR..12*U_MILLIS_PER_HOUR
DST_OFFSET, // Example: 0 or U_MILLIS_PER_HOUR
FIELD_COUNT,
DAY_OF_MONTH = DATE // Synonyms
@ -734,13 +734,13 @@ public:
* Concrete subclasses of Calendar must implement getDynamicClassID() and also a
* static method and data member:
*
* static ClassID getStaticClassID() { return (ClassID)&fgClassID; }
* static UClassID getStaticClassID() { return (UClassID)&fgClassID; }
* static char fgClassID;
*
* @return The class ID for this object. All objects of a given class have the
* same class ID. Objects of other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const = 0;
virtual UClassID getDynamicClassID(void) const = 0;
protected:

12
icu4c/source/i18n/choicfmt.cpp
View file

@ -152,7 +152,7 @@ ChoiceFormat::getNumberFormat(UErrorCode &status)
if(theFormat == 0) // If we weren't able to pull it out of the cache, then we have to create it.
{
theFormat = NumberFormat::createInstance(Locale::US, status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
theFormat->setMinimumFractionDigits(1);
}
@ -189,14 +189,14 @@ ChoiceFormat::stod(const UnicodeString& string,
// or string or vice versa.
NumberFormat *myFormat = getNumberFormat(status);
if(FAILURE(status))
if(U_FAILURE(status))
return -1; // OK?
Formattable result;
myFormat->parse(string, result, status);
releaseNumberFormat(myFormat);
double value = 0.0;
if (SUCCESS(status))
if (U_SUCCESS(status))
{
switch(result.getType())
{
@ -220,7 +220,7 @@ ChoiceFormat::dtos(double value,
{
NumberFormat *myFormat = getNumberFormat(status);
if (SUCCESS(status)) {
if (U_SUCCESS(status)) {
FieldPosition fieldPos(0);
myFormat->format(value, string, fieldPos);
}
@ -235,7 +235,7 @@ void
ChoiceFormat::applyPattern(const UnicodeString& newPattern,
UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
return;
UnicodeString segments[2];
@ -279,7 +279,7 @@ ChoiceFormat::applyPattern(const UnicodeString& newPattern,
else {
//segments[0].trim();
startValue = stod(tempBuffer, status);
if(FAILURE(status))
if(U_FAILURE(status))
return;
}

6
icu4c/source/i18n/choicfmt.h
View file

@ -299,7 +299,7 @@ public:
* given class have the same class ID. Objects of
* other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const;
virtual UClassID getDynamicClassID(void) const;
/**
* Return the class ID for this class. This is useful only for
@ -311,7 +311,7 @@ public:
* </pre>
* @return The class ID for all objects of this class.
*/
static ClassID getStaticClassID(void) { return (ClassID)&fgClassID; }
static UClassID getStaticClassID(void) { return (UClassID)&fgClassID; }
/*
* Finds the least double greater than d (if positive == true),
@ -369,7 +369,7 @@ private:
int32_t fCount;
};
inline ClassID
inline UClassID
ChoiceFormat::getDynamicClassID() const
{
return ChoiceFormat::getStaticClassID();

20
icu4c/source/i18n/coleitr.cpp
View file

@ -71,7 +71,7 @@ CollationElementIterator::CollationElementIterator( const UnicodeString& sourceT
bufferAlias(NULL),
orderAlias(order)
{
if (FAILURE(status)) {
if (U_FAILURE(status)) {
return;
}
@ -107,7 +107,7 @@ CollationElementIterator::CollationElementIterator( const CharacterIterator& sou
bufferAlias(NULL),
orderAlias(order)
{
if (FAILURE(status)) {
if (U_FAILURE(status)) {
return;
}
@ -231,7 +231,7 @@ void
CollationElementIterator::setText(const UnicodeString& source,
UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -256,7 +256,7 @@ void
CollationElementIterator::setText(CharacterIterator& source,
UErrorCode& status)
{
if (FAILURE(status)) {
if (U_FAILURE(status)) {
return;
}
@ -282,7 +282,7 @@ CollationElementIterator::setText(CharacterIterator& source,
int32_t
CollationElementIterator::next(UErrorCode& status)
{
if (text == NULL || FAILURE(status))
if (text == NULL || U_FAILURE(status))
{
return NULLORDER;
}
@ -328,7 +328,7 @@ CollationElementIterator::next(UErrorCode& status)
UChar ch = text->current();
text->next();
if (FAILURE(status))
if (U_FAILURE(status))
{
return NULLORDER;
}
@ -374,7 +374,7 @@ CollationElementIterator::next(UErrorCode& status)
int32_t
CollationElementIterator::previous(UErrorCode& status)
{
if (text == NULL || FAILURE(status))
if (text == NULL || U_FAILURE(status))
{
return NULLORDER;
}
@ -457,7 +457,7 @@ void
CollationElementIterator::setOffset(UTextOffset newOffset,
UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -500,7 +500,7 @@ CollationElementIterator::nextContractChar(UChar ch,
while ((ch = text->current()) != Normalizer::DONE)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return NULLORDER;
}
@ -552,7 +552,7 @@ int32_t CollationElementIterator::prevContractChar(UChar ch,
{
ch = text->next();
if (FAILURE(status))
if (U_FAILURE(status))
{
return NULLORDER;
}

20
icu4c/source/i18n/coll.h
View file

@ -214,7 +214,7 @@ public :
* @see Locale#getDefault
* The UErrorCode& err parameter is used to return status information to the user.
* To check whether the construction succeeded or not, you should check
* the value of SUCCESS(err). If you wish more detailed information, you
* the value of U_SUCCESS(err). If you wish more detailed information, you
* can check for informational error results which still indicate success.
* U_USING_FALLBACK_ERROR indicates that a fall back locale was used. For
* example, 'de_CH' was requested, but nothing was found there, so 'de' was
@ -238,7 +238,7 @@ public :
* @see ResourceLoader
* The UErrorCode& err parameter is used to return status information to the user.
* To check whether the construction succeeded or not, you should check
* the value of SUCCESS(err). If you wish more detailed information, you
* the value of U_SUCCESS(err). If you wish more detailed information, you
* can check for informational error results which still indicate success.
* U_USING_FALLBACK_ERROR indicates that a fall back locale was used. For
* example, 'de_CH' was requested, but nothing was found there, so 'de' was
@ -259,7 +259,7 @@ public :
* <pre>
* . UErrorCode status = U_ZERO_ERROR;
* . Collator *myCollation = Collator::createInstance(Locale::US, status);
* . if (FAILURE(status)) return;
* . if (U_FAILURE(status)) return;
* . myCollation->setStrength(Collator::PRIMARY);
* . // result would be Collator::EQUAL ("abc" == "ABC")
* . // (no primary difference between "abc" and "ABC")
@ -284,7 +284,7 @@ public :
* <pre>
* . UErrorCode status = U_ZERO_ERROR;
* . Collator *myCollation = Collator::createInstance(Locale::US, status);
* . if (FAILURE(status)) return;
* . if (U_FAILURE(status)) return;
* . myCollation->setStrength(Collator::PRIMARY);
* . // result would be Collator::EQUAL ("abc" == "ABC")
* . // (no primary difference between "abc" and "ABC")
@ -318,21 +318,21 @@ public :
* <pre>
* . UErrorCode status = U_ZERO_ERROR;
* . Collator *myCollation = Collator::createInstance(Locale::US, status);
* . if (FAILURE(status)) return;
* . if (U_FAILURE(status)) return;
* . myCollation->setStrength(Collator::PRIMARY);
* . UErrorCode key1Status, key2Status;
* . CollationKey CollationKey1
* . CollationKey1 = myCollation->getCollationKey("abc", CollationKey1, key1Status);
* . CollationKey CollationKey2
* . CollationKey2 = myCollation->getCollationKey("ABC", CollationKey2, key2Status);
* . if (FAILURE(key1Status) || FAILURE(key2Status)) { delete myCollation; return; }
* . if (U_FAILURE(key1Status) || U_FAILURE(key2Status)) { delete myCollation; return; }
* . // Use CollationKey::compare() to compare the sort keys
* . // result would be 0 (CollationKey1 == CollationKey2)
* . int result = CollationKey1.compare(CollationKey2);
* . myCollation->setStrength(Collator::TERTIARY);
* . CollationKey1 = myCollation->getCollationKey("abc", CollationKey1, key1Status);
* . CollationKey2 = myCollation->getCollationKey("ABC", CollationKey2, key2Status);
* . if (FAILURE(key1Status) || FAILURE(key2Status)) { delete myCollation; return; }
* . if (U_FAILURE(key1Status) || U_FAILURE(key2Status)) { delete myCollation; return; }
* . // Use CollationKey::compareTo to compare the collation keys
* . // result would be -1 (CollationKey1 &lt; CollationKey2)
* . result = CollationKey1.compareTo(CollationKey2);
@ -416,7 +416,7 @@ public :
* <pre>
* . UErrorCode status = U_ZERO_ERROR;
* . Collator *myCollation = Collator::createInstance(Locale::US, status);
* . if (FAILURE(status)) return;
* . if (U_FAILURE(status)) return;
* . myCollation->setStrength(Collator::PRIMARY);
* . // result will be "abc" == "ABC"
* . // tertiary differences will be ignored
@ -464,14 +464,14 @@ public :
* Concrete subclasses of Format must implement getDynamicClassID()
* and also a static method and data member:
*
* static ClassID getStaticClassID() { return (ClassID)&fgClassID; }
* static UClassID getStaticClassID() { return (UClassID)&fgClassID; }
* static char fgClassID;
*
* @return The class ID for this object. All objects of a
* given class have the same class ID. Objects of
* other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const = 0;
virtual UClassID getDynamicClassID(void) const = 0;
protected:
/**

10
icu4c/source/i18n/datefmt.cpp
View file

@ -99,7 +99,7 @@ DateFormat::format(const Formattable& obj,
FieldPosition& fieldPosition,
UErrorCode& status) const
{
if (FAILURE(status)) return toAppendTo;
if (U_FAILURE(status)) return toAppendTo;
// if the type of the Formattable is double or long, treat it as if it were a Date
switch (obj.getType())
@ -143,7 +143,7 @@ UDate
DateFormat::parse(const UnicodeString& text,
UErrorCode& status) const
{
if (FAILURE(status)) return 0;
if (U_FAILURE(status)) return 0;
ParsePosition pos(0);
UDate result = parse(text, pos);
@ -207,14 +207,14 @@ DateFormat::create(EStyle timeStyle, EStyle dateStyle, const Locale& locale)
// Try to create a SimpleDateFormat of the desired style.
UErrorCode status = U_ZERO_ERROR;
SimpleDateFormat *f = new SimpleDateFormat(timeStyle, dateStyle, locale, status);
if (SUCCESS(status)) return f;
if (U_SUCCESS(status)) return f;
delete f;
// If that fails, try to create a format using the default pattern and
// the DateFormatSymbols for this locale.
status = U_ZERO_ERROR;
f = new SimpleDateFormat(locale, status);
if (SUCCESS(status)) return f;
if (U_SUCCESS(status)) return f;
delete f;
// This should never really happen, because the preceding constructor
@ -251,7 +251,7 @@ DateFormat::getAvailableLocales(int32_t& count)
ResourceBundle resource(Locale::getDataDirectory(), locales[i], status);
int32_t ignoredCount;
resource.getStringArray(SimpleDateFormat::fgDateTimePatternsTag, ignoredCount, status);
if (SUCCESS(status))
if (U_SUCCESS(status))
{
temp[newLocalesCount++] = locales[i];
}

6
icu4c/source/i18n/dcfmtsym.cpp
View file

@ -176,10 +176,10 @@ void
DecimalFormatSymbols::initialize(const Locale& locale, UErrorCode& status,
bool_t useLastResortData)
{
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
ResourceBundle resource(Locale::getDataDirectory(), locale, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
// Initializes with last resort data if necessary.
if (useLastResortData)
@ -196,7 +196,7 @@ DecimalFormatSymbols::initialize(const Locale& locale, UErrorCode& status,
int32_t currencyElementsLength=0;
// Gets the currency element array.
const UnicodeString* currencyElements = resource.getStringArray(fgCurrencyElements, currencyElementsLength, status);
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
// If the array size is too small, something is wrong with the resource
// bundle, returns the failure error code.

6
icu4c/source/i18n/decimfmt.cpp
View file

@ -183,7 +183,7 @@ DecimalFormat::construct(UErrorCode& status,
fRoundingIncrement = NULL;
fRoundingDouble = 0.0;
fRoundingMode = kRoundHalfEven;
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
fPosPrefixPattern = fPosSuffixPattern = NULL;
fNegPrefixPattern = fNegSuffixPattern = NULL;
@ -206,7 +206,7 @@ DecimalFormat::construct(UErrorCode& status,
pattern = &str;
}
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
applyPattern(*pattern, FALSE /*not localized*/, status);
}
@ -2109,7 +2109,7 @@ DecimalFormat::applyPattern(const UnicodeString& pattern,
bool_t localized,
UErrorCode& status)
{
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
// Set the significant pattern symbols
UChar zeroDigit = kPatternZeroDigit;
UChar groupingSeparator = kPatternGroupingSeparator;

4
icu4c/source/i18n/decimfmt.h
View file

@ -784,7 +784,7 @@ public:
* </pre>
* @return The class ID for all objects of this class.
*/
static ClassID getStaticClassID(void) { return (ClassID)&fgClassID; }
static UClassID getStaticClassID(void) { return (UClassID)&fgClassID; }
/**
* Returns a unique class ID POLYMORPHICALLY. Pure virtual override.
@ -796,7 +796,7 @@ public:
* given class have the same class ID. Objects of
* other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const { return getStaticClassID(); }
virtual UClassID getDynamicClassID(void) const { return getStaticClassID(); }
private:
static char fgClassID;

4
icu4c/source/i18n/dtfmtsym.cpp
View file

@ -417,7 +417,7 @@ DateFormatSymbols::setLocalPatternChars(const UnicodeString& newLocalPatternChar
void
DateFormatSymbols::initializeData(const Locale& locale, UErrorCode& status, bool_t useLastResortData)
{
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
fIsOwned = 0; // Nothing is owned
@ -427,7 +427,7 @@ DateFormatSymbols::initializeData(const Locale& locale, UErrorCode& status, bool
* these.
*/
ResourceBundle resource(Locale::getDataDirectory(), locale, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
if (useLastResortData)
{

4
icu4c/source/i18n/format.cpp
View file

@ -69,7 +69,7 @@ Format::format(const Formattable& obj,
UnicodeString& toAppendTo,
UErrorCode& status) const
{
if (FAILURE(status)) return toAppendTo;
if (U_FAILURE(status)) return toAppendTo;
// {sfb} should really be FieldPosition::DONT_CARE, not 0
// leave at 0 for now, to keep in sync with Java
@ -87,7 +87,7 @@ Format::parseObject(const UnicodeString& source,
Formattable& result,
UErrorCode& status) const
{
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
ParsePosition parsePosition(0);
parseObject(source, result, parsePosition);

36
icu4c/source/i18n/gregocal.cpp
View file

@ -110,13 +110,13 @@ const UDate GregorianCalendar::LATEST_SUPPORTED_MILLIS = 4503599627370495.0
* (*) In units of one-hour
*/
const int32_t GregorianCalendar::kMinValues[] = {
0,1,0,1,0,1,1,1,-1,0,0,0,0,0,0,-12*kMillisPerHour,0
0,1,0,1,0,1,1,1,-1,0,0,0,0,0,0,-12*U_MILLIS_PER_HOUR,0
};
const int32_t GregorianCalendar::kLeastMaxValues[] = {
1,140742,11,52,4,28,365,7,4,1,11,23,59,59,999,12*kMillisPerHour,1*kMillisPerHour
1,140742,11,52,4,28,365,7,4,1,11,23,59,59,999,12*U_MILLIS_PER_HOUR,1*U_MILLIS_PER_HOUR
};
const int32_t GregorianCalendar::kMaxValues[] = {
1,144683,11,53,6,31,366,7,6,1,11,23,59,59,999,12*kMillisPerHour,1*kMillisPerHour
1,144683,11,53,6,31,366,7,6,1,11,23,59,59,999,12*U_MILLIS_PER_HOUR,1*U_MILLIS_PER_HOUR
};
char GregorianCalendar::fgClassID = 0; // Value is irrelevant
@ -314,7 +314,7 @@ bool_t GregorianCalendar::equivalentTo(const Calendar& other) const
void
GregorianCalendar::setGregorianChange(UDate date, UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
return;
fGregorianCutover = date;
@ -342,7 +342,7 @@ GregorianCalendar::setGregorianChange(UDate date, UErrorCode& status)
// Normalize the year so BC values are represented as 0 and negative
// values.
GregorianCalendar *cal = new GregorianCalendar(getTimeZone(), status);
if(FAILURE(status))
if(U_FAILURE(status))
return;
cal->setTime(date, status);
fGregorianCutoverYear = cal->get(YEAR, status);
@ -382,7 +382,7 @@ GregorianCalendar::isLeapYear(int32_t year) const
void
GregorianCalendar::timeToFields(UDate theTime, bool_t quick, UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
return;
int32_t rawYear;
@ -586,7 +586,7 @@ GregorianCalendar::yearLength() const
void
GregorianCalendar::computeFields(UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
return;
int32_t rawOffset = getTimeZone().getRawOffset();
@ -625,13 +625,13 @@ GregorianCalendar::computeFields(UErrorCode& status)
double days = icu_floor(localMillis / kOneDay);
int32_t millisInDay = (int32_t) (localMillis - (days * kOneDay));
if (millisInDay < 0)
millisInDay += kMillisPerDay;
millisInDay += U_MILLIS_PER_DAY;
// Call getOffset() to get the TimeZone offset. The millisInDay value must
// be standard local millis.
int32_t dstOffset = getTimeZone().getOffset(era, year, month, date, dayOfWeek, millisInDay,
monthLength(month), status) - rawOffset;
if(FAILURE(status))
if(U_FAILURE(status))
return;
// Adjust our millisInDay for DST, if necessary.
@ -641,9 +641,9 @@ GregorianCalendar::computeFields(UErrorCode& status)
// This happens in DST between 12:00 am and 1:00 am every day. The call to
// timeToFields() will give the wrong day, since the Standard time is in the
// previous day.
if (millisInDay >= kMillisPerDay) {
if (millisInDay >= U_MILLIS_PER_DAY) {
UDate dstMillis = localMillis + dstOffset;
millisInDay -= kMillisPerDay;
millisInDay -= U_MILLIS_PER_DAY;
// As above, check for and pin extreme values
if(localMillis > 0 && dstMillis < 0 && dstOffset > 0) {
dstMillis = LATEST_SUPPORTED_MILLIS;
@ -763,7 +763,7 @@ GregorianCalendar::getEpochDay(UErrorCode& status)
void
GregorianCalendar::computeTime(UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
return;
if (! isLenient() && ! validateFields()) {
@ -1191,7 +1191,7 @@ GregorianCalendar::aggregateStamp(EStampValues stamp_a, EStampValues stamp_b)
void
GregorianCalendar::add(EDateFields field, int32_t amount, UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
return;
if (amount == 0)
@ -1338,7 +1338,7 @@ GregorianCalendar::add(EDateFields field, int32_t amount, UErrorCode& status)
void
GregorianCalendar::roll(EDateFields field, int32_t amount, UErrorCode& status)
{
if(FAILURE(status))
if(U_FAILURE(status))
return;
if (amount == 0)
@ -1724,11 +1724,11 @@ GregorianCalendar::getActualMaximum(EDateFields field) const
cal->setLenient(TRUE);
int32_t era = cal->get(ERA, status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
UDate d = cal->getTime(status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
/* Perform a binary search, with the invariant that lowGood is a
@ -1764,13 +1764,13 @@ GregorianCalendar::getActualMaximum(EDateFields field) const
bool_t
GregorianCalendar::inDaylightTime(UErrorCode& status) const
{
if (FAILURE(status) || !getTimeZone().useDaylightTime())
if (U_FAILURE(status) || !getTimeZone().useDaylightTime())
return FALSE;
// Force an update of the state of the Calendar.
((GregorianCalendar*)this)->complete(status); // cast away const
return SUCCESS(status) ? (internalGet(DST_OFFSET) != 0) : FALSE;
return U_SUCCESS(status) ? (internalGet(DST_OFFSET) != 0) : FALSE;
}
// -------------------------------------

4
icu4c/source/i18n/gregocal.h
View file

@ -413,7 +413,7 @@ public:
* @return The class ID for this object. All objects of a given class have the
* same class ID. Objects of other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const { return (ClassID)&fgClassID; }
virtual UClassID getDynamicClassID(void) const { return (UClassID)&fgClassID; }
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -425,7 +425,7 @@ public:
*
* @return The class ID for all objects of this class.
*/
static ClassID getStaticClassID(void) { return (ClassID)&fgClassID; }
static UClassID getStaticClassID(void) { return (UClassID)&fgClassID; }
protected:

16
icu4c/source/i18n/mergecol.cpp
View file

@ -84,7 +84,7 @@ MergeCollation::MergeCollation(const UnicodeString& pattern,
}
setPattern(pattern, decompMode, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
delete [] statusArray;
statusArray = NULL;
@ -250,7 +250,7 @@ void MergeCollation::setPattern(const UnicodeString& pattern,
Normalizer::EMode decompMode,
UErrorCode& success)
{
if (FAILURE(success))
if (U_FAILURE(success))
{
return;
}
@ -258,7 +258,7 @@ void MergeCollation::setPattern(const UnicodeString& pattern,
patterns->clear();
addPattern(pattern, decompMode, success);
if (FAILURE(success))
if (U_FAILURE(success))
{
delete patterns;
patterns = NULL;
@ -273,7 +273,7 @@ void MergeCollation::addPattern(const UnicodeString& pattern,
Normalizer::EMode decompMode,
UErrorCode& success)
{
if (FAILURE(success) || (pattern.size() == 0))
if (U_FAILURE(success) || (pattern.size() == 0))
{
return;
}
@ -284,7 +284,7 @@ void MergeCollation::addPattern(const UnicodeString& pattern,
while (entry != NULL)
{
if (FAILURE(success))
if (U_FAILURE(success))
{
delete entry;
break;
@ -292,7 +292,7 @@ void MergeCollation::addPattern(const UnicodeString& pattern,
fixEntry(entry, success);
if (FAILURE(success))
if (U_FAILURE(success))
{
delete entry;
break;
@ -400,7 +400,7 @@ void MergeCollation::fixEntry(PatternEntry* newEntry,
// Find the insertion point for the new entry.
int32_t lastIndex = findLastEntry(lastEntry, excess, success);
if (FAILURE(success))
if (U_FAILURE(success))
{
return;
}
@ -441,7 +441,7 @@ MergeCollation::findLastEntry(const PatternEntry* lastEntry,
UnicodeString& excess,
UErrorCode& success) const
{
if (FAILURE(success))
if (U_FAILURE(success))
{
return -1;
}

36
icu4c/source/i18n/msgfmt.cpp
View file

@ -263,7 +263,7 @@ MessageFormat::applyPattern(const UnicodeString& newPattern,
if (braceStack == 0) {
part = 0;
makeFormat(i, formatNumber, segments, success);
if(FAILURE(success))
if(U_FAILURE(success))
return;
formatNumber++;
} else {
@ -516,7 +516,7 @@ MessageFormat::format(const Formattable* source,
FieldPosition& ignore,
UErrorCode& success) const
{
if (FAILURE(success))
if (U_FAILURE(success))
return result;
return format(source, cnt, result, ignore, 0, success);
@ -536,7 +536,7 @@ MessageFormat::format( const UnicodeString& pattern,
{
// {sfb} why does this use a local when so many other places use a static?
MessageFormat *temp = new MessageFormat(pattern, success);
if (FAILURE(success))
if (U_FAILURE(success))
return result;
FieldPosition ignore(0);
temp->format(arguments, cnt, result, ignore, success);
@ -557,7 +557,7 @@ MessageFormat::format(const Formattable& source,
{
int32_t cnt;
if (FAILURE(success))
if (U_FAILURE(success))
return result;
if (source.getType() != Formattable::kArray) {
success = U_ILLEGAL_ARGUMENT_ERROR;
@ -621,13 +621,13 @@ MessageFormat::format(const Formattable* arguments,
(obj.getType() == Formattable::kLong)) {
NumberFormat *numTemplate = NULL;
numTemplate = NumberFormat::createInstance(fLocale, success);
if (FAILURE(success)) {
if (U_FAILURE(success)) {
delete numTemplate;
return result;
}
numTemplate->format((obj.getType() == Formattable::kDouble) ? obj.getDouble() : obj.getLong(), arg);
delete numTemplate;
if (FAILURE(success))
if (U_FAILURE(success))
return result;
}
// If the obj data type is a Date instance, use a DateFormat instance.
@ -652,10 +652,10 @@ MessageFormat::format(const Formattable* arguments,
if (tryRecursion && arg.indexOf("{") >= 0) {
MessageFormat *temp = NULL;
temp = new MessageFormat(arg, fLocale, success);
if (FAILURE(success))
if (U_FAILURE(success))
return result;
temp->format(arguments, cnt, result, status, recursionProtection, success);
if (FAILURE(success)) {
if (U_FAILURE(success)) {
delete temp;
return result;
}
@ -849,7 +849,7 @@ MessageFormat::getNumberFormat(UErrorCode &status)
if(theFormat == 0) // If we weren't able to pull it out of the cache, then we have to create it.
{
theFormat = NumberFormat::createInstance(Locale::US, status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
theFormat->setParseIntegerOnly(TRUE);
}
@ -886,7 +886,7 @@ MessageFormat::stoi(const UnicodeString& string,
{
NumberFormat *myFormat = getNumberFormat(status);
if(FAILURE(status))
if(U_FAILURE(status))
return -1; // OK?
Formattable result;
@ -896,7 +896,7 @@ MessageFormat::stoi(const UnicodeString& string,
releaseNumberFormat(myFormat);
int32_t value = 0;
if (SUCCESS(status) && result.getType() == Formattable::kLong)
if (U_SUCCESS(status) && result.getType() == Formattable::kLong)
value = result.getLong();
@ -917,7 +917,7 @@ MessageFormat::itos(int32_t i,
UErrorCode status = U_ZERO_ERROR;
NumberFormat *myFormat = getNumberFormat(status);
if(FAILURE(status))
if(U_FAILURE(status))
return (string = "<ERROR>"); // _REVISIT_ maybe toPattern should take an errorcode.
UnicodeString &retval = myFormat->format(i, string);
@ -936,7 +936,7 @@ MessageFormat::makeFormat(int32_t position,
UnicodeString* segments,
UErrorCode& success)
{
if(FAILURE(success))
if(U_FAILURE(success))
return;
// get the number
@ -972,13 +972,13 @@ MessageFormat::makeFormat(int32_t position,
break;
default: // pattern
newFormat = NumberFormat::createInstance(fLocale, success);
if(FAILURE(success)) {
if(U_FAILURE(success)) {
newFormat = NULL;
return;
}
if(newFormat->getDynamicClassID() == DecimalFormat::getStaticClassID())
((DecimalFormat*)newFormat)->applyPattern(segments[3], success);
if(FAILURE(success)) {
if(U_FAILURE(success)) {
fMaxOffset = oldMaxOffset;
success = U_ILLEGAL_ARGUMENT_ERROR;
return;
@ -1008,7 +1008,7 @@ MessageFormat::makeFormat(int32_t position,
newFormat = DateFormat::createDateInstance(DateFormat::kDefault, fLocale);
if(newFormat->getDynamicClassID() == SimpleDateFormat::getStaticClassID())
((SimpleDateFormat*)newFormat)->applyPattern(segments[3]);
if(FAILURE(success)) {
if(U_FAILURE(success)) {
fMaxOffset = oldMaxOffset;
success = U_ILLEGAL_ARGUMENT_ERROR;
return;
@ -1037,7 +1037,7 @@ MessageFormat::makeFormat(int32_t position,
newFormat = DateFormat::createTimeInstance(DateFormat::kDefault, fLocale);
if(newFormat->getDynamicClassID() == SimpleDateFormat::getStaticClassID())
((SimpleDateFormat*)newFormat)->applyPattern(segments[3]);
if(FAILURE(success)) {
if(U_FAILURE(success)) {
fMaxOffset = oldMaxOffset;
success = U_ILLEGAL_ARGUMENT_ERROR;
return;
@ -1047,7 +1047,7 @@ MessageFormat::makeFormat(int32_t position,
break;
case 7: case 8:// choice
newFormat = new ChoiceFormat(segments[3], success);
if(FAILURE(success)) {
if(U_FAILURE(success)) {
fMaxOffset = oldMaxOffset;
success = U_ILLEGAL_ARGUMENT_ERROR;
return;

6
icu4c/source/i18n/msgfmt.h
View file

@ -429,7 +429,7 @@ public:
* given class have the same class ID. Objects of
* other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const;
virtual UClassID getDynamicClassID(void) const;
/**
* Return the class ID for this class. This is useful only for
@ -441,7 +441,7 @@ public:
* </pre>
* @return The class ID for all objects of this class.
*/
static ClassID getStaticClassID(void) { return (ClassID)&fgClassID; }
static UClassID getStaticClassID(void) { return (UClassID)&fgClassID; }
private:
static char fgClassID;
@ -548,7 +548,7 @@ private:
static UnicodeString& itos(int32_t i, UnicodeString& string);
};
inline ClassID
inline UClassID
MessageFormat::getDynamicClassID() const
{
return MessageFormat::getStaticClassID();

18
icu4c/source/i18n/numfmt.cpp
View file

@ -131,7 +131,7 @@ NumberFormat::format(const Formattable& obj,
FieldPosition& pos,
UErrorCode& status) const
{
if (FAILURE(status)) return toAppendTo;
if (U_FAILURE(status)) return toAppendTo;
if (obj.getType() == Formattable::kDouble) {
return format(obj.getDouble(), toAppendTo, pos);
@ -191,7 +191,7 @@ NumberFormat::parse(const UnicodeString& text,
Formattable& result,
UErrorCode& status) const
{
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
ParsePosition parsePosition(0);
parse(text, result, parsePosition);
@ -405,7 +405,7 @@ NumberFormat::createInstance(const Locale& desiredLocale,
EStyles style,
UErrorCode& status)
{
if (FAILURE(status)) return NULL;
if (U_FAILURE(status)) return NULL;
if (style < 0 || style >= kStyleCount) {
status = U_ILLEGAL_ARGUMENT_ERROR;
@ -413,18 +413,18 @@ NumberFormat::createInstance(const Locale& desiredLocale,
}
ResourceBundle resource(Locale::getDataDirectory(), desiredLocale, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
// We don't appear to have resource data available -- use the last-resort data
status = U_USING_FALLBACK_ERROR;
// Use the DecimalFormatSymbols constructor which uses last-resort data
DecimalFormatSymbols* symbolsToAdopt = new DecimalFormatSymbols(status);
if (FAILURE(status)) { delete symbolsToAdopt; return NULL; } // This should never happen
if (U_FAILURE(status)) { delete symbolsToAdopt; return NULL; } // This should never happen
// Creates a DecimalFormat instance with the last resort number patterns.
NumberFormat* f = new DecimalFormat(fgLastResortNumberPatterns[style], symbolsToAdopt, status);
if (FAILURE(status)) { delete f; f = NULL; }
if (U_FAILURE(status)) { delete f; f = NULL; }
return f;
}
@ -434,7 +434,7 @@ NumberFormat::createInstance(const Locale& desiredLocale,
// If not all the styled patterns exists for the NumberFormat in this locale,
// sets the status code to failure and returns nil.
if (patternCount < fgNumberPatternsCount) status = U_INVALID_FORMAT_ERROR;
if (FAILURE(status)) return NULL;
if (U_FAILURE(status)) return NULL;
// If the requested style doesn't exist, use a last-resort style.
// This is to support scientific styles before we have all the
@ -444,11 +444,11 @@ NumberFormat::createInstance(const Locale& desiredLocale,
// Loads the decimal symbols of the desired locale.
DecimalFormatSymbols* symbolsToAdopt = new DecimalFormatSymbols(desiredLocale, status);
if (FAILURE(status)) { delete symbolsToAdopt; return NULL; }
if (U_FAILURE(status)) { delete symbolsToAdopt; return NULL; }
// Creates the specified decimal format style of the desired locale.
NumberFormat* f = new DecimalFormat(pattern, symbolsToAdopt, status);
if (FAILURE(status)) { delete f; f = NULL; }
if (U_FAILURE(status)) { delete f; f = NULL; }
return f;
}

4
icu4c/source/i18n/numfmt.h
View file

@ -442,7 +442,7 @@ public:
* </pre>
* @return The class ID for all objects of this class.
*/
static ClassID getStaticClassID(void) { return (ClassID)&fgClassID; }
static UClassID getStaticClassID(void) { return (UClassID)&fgClassID; }
/**
* Override Calendar
@ -455,7 +455,7 @@ public:
* given class have the same class ID. Objects of
* other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const { return getStaticClassID(); }
virtual UClassID getDynamicClassID(void) const { return getStaticClassID(); }
protected:

2
icu4c/source/i18n/ptnentry.cpp
View file

@ -63,7 +63,7 @@ PatternEntry::PatternEntry(int32_t newStrength,
//
UErrorCode status = U_ZERO_ERROR;
Normalizer::normalize(newChars, decompMode, 0, chars, status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
chars = newChars;
}
}

22
icu4c/source/i18n/simpletz.cpp
View file

@ -53,7 +53,7 @@ SimpleTimeZone::SimpleTimeZone(int32_t rawOffset, const UnicodeString& ID)
endDayOfWeek(0),
endTime(0),
startYear(0),
dstSavings(kMillisPerHour),
dstSavings(U_MILLIS_PER_HOUR),
useDaylight(FALSE)
{
setID(ID);
@ -79,7 +79,7 @@ SimpleTimeZone::SimpleTimeZone(int32_t rawOffset, const UnicodeString& ID,
this->endDay = endDay;
this->endDayOfWeek = endDayOfWeek;
this->endTime = endTime;
this->dstSavings = kMillisPerHour;
this->dstSavings = U_MILLIS_PER_HOUR;
decodeRules(status);
}
@ -352,7 +352,7 @@ SimpleTimeZone::getOffset(uint8_t era, int32_t year, int32_t month, int32_t day,
uint8_t dayOfWeek, int32_t millis,
int32_t monthLength, UErrorCode& status) const
{
if(FAILURE(status)) return 0;
if(U_FAILURE(status)) return 0;
if ((era != GregorianCalendar::AD && era != GregorianCalendar::BC)
|| month < Calendar::JANUARY
@ -362,7 +362,7 @@ SimpleTimeZone::getOffset(uint8_t era, int32_t year, int32_t month, int32_t day,
|| dayOfWeek < Calendar::SUNDAY
|| dayOfWeek > Calendar::SATURDAY
|| millis < 0
|| millis >= kMillisPerDay
|| millis >= U_MILLIS_PER_DAY
|| monthLength < 28
|| monthLength > 31) {
status = U_ILLEGAL_ARGUMENT_ERROR;
@ -397,8 +397,8 @@ SimpleTimeZone::getOffset(uint8_t era, int32_t year, int32_t month, int32_t day,
* passed in to convert them from standard to wall time. We then must
* normalize the millis to the range 0..millisPerDay-1. */
millis += dstSavings; // Assume dstSavings > 0
while(millis >= kMillisPerDay) {
millis -= kMillisPerDay;
while(millis >= U_MILLIS_PER_DAY) {
millis -= U_MILLIS_PER_DAY;
++day;
dayOfWeek = 1 + (dayOfWeek % 7); // Assume dayOfWeek is one-based
if (day > monthLength) {
@ -563,7 +563,7 @@ bool_t SimpleTimeZone::inDaylightTime(UDate date, UErrorCode& status) const
// This method is wasteful since it creates a new GregorianCalendar and
// deletes it each time it is called. However, this is a deprecated method
// and provided only for Java compatibility as of 8/6/97 [LIU].
if (FAILURE(status)) return FALSE;
if (U_FAILURE(status)) return FALSE;
GregorianCalendar *gc = new GregorianCalendar(*this, status);
gc->setTime(date, status);
bool_t result = gc->inDaylightTime(status);
@ -701,7 +701,7 @@ SimpleTimeZone::decodeRules(UErrorCode& status)
void
SimpleTimeZone::decodeStartRule(UErrorCode& status)
{
if(FAILURE(status)) return;
if(U_FAILURE(status)) return;
useDaylight = ((startDay != 0) && (endDay != 0) ? TRUE : FALSE);
if (startDay != 0) {
@ -709,7 +709,7 @@ SimpleTimeZone::decodeStartRule(UErrorCode& status)
status = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
if (startTime < 0 || startTime > kMillisPerDay) {
if (startTime < 0 || startTime > U_MILLIS_PER_DAY) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
@ -752,7 +752,7 @@ SimpleTimeZone::decodeStartRule(UErrorCode& status)
void
SimpleTimeZone::decodeEndRule(UErrorCode& status)
{
if(FAILURE(status)) return;
if(U_FAILURE(status)) return;
useDaylight = ((startDay != 0) && (endDay != 0) ? TRUE : FALSE);
if (endDay != 0) {
@ -760,7 +760,7 @@ SimpleTimeZone::decodeEndRule(UErrorCode& status)
status = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
if (endTime < 0 || endTime > kMillisPerDay) {
if (endTime < 0 || endTime > U_MILLIS_PER_DAY) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return;
}

44
icu4c/source/i18n/smpdtfmt.cpp
View file

@ -187,9 +187,9 @@ SimpleDateFormat::SimpleDateFormat(const Locale& locale,
fDefaultCenturyStart(fgSystemDefaultCentury),
fDefaultCenturyStartYear(fgSystemDefaultCenturyYear)
{
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
fSymbols = new DateFormatSymbols(locale, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
status = U_ZERO_ERROR;
delete fSymbols;
@ -265,14 +265,14 @@ void SimpleDateFormat::construct(EStyle timeStyle,
{
// called by several constructors to load pattern data from the resources
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
// load up the DateTimePatters resource from the appropriate locale (throw
// an error if for some weird reason the resource is malformed)
ResourceBundle resources(Locale::getDataDirectory(), locale, status);
int32_t dtCount;
const UnicodeString *dateTimePatterns = resources.getStringArray(fgDateTimePatternsTag, dtCount, status);
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
if (dtCount <= kDateTime)
{
status = U_INVALID_FORMAT_ERROR;
@ -325,7 +325,7 @@ void
SimpleDateFormat::initialize(const Locale& locale,
UErrorCode& status)
{
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
// {sfb} should this be here?
if (fSymbols->fZoneStringsColCount < 1)
@ -338,7 +338,7 @@ SimpleDateFormat::initialize(const Locale& locale,
// least one row
fCalendar = Calendar::createInstance(TimeZone::createDefault(), locale, status);
fNumberFormat = NumberFormat::createInstance(locale, status);
if (fNumberFormat != NULL && SUCCESS(status))
if (fNumberFormat != NULL && U_SUCCESS(status))
{
// no matter what the locale's default number format looked like, we want
// to modify it so that it doesn't use thousands separators, doesn't always
@ -352,7 +352,7 @@ SimpleDateFormat::initialize(const Locale& locale,
initializeDefaultCentury();
}
else if (SUCCESS(status))
else if (U_SUCCESS(status))
{
status = U_MISSING_RESOURCE_ERROR;
}
@ -376,11 +376,11 @@ void SimpleDateFormat::initializeDefaultCentury()
*/
void SimpleDateFormat::parseAmbiguousDatesAsAfter(UDate startDate, UErrorCode& status)
{
if(FAILURE(status))
if(U_FAILURE(status))
return;
fCalendar->setTime(startDate, status);
if(SUCCESS(status)) {
if(U_SUCCESS(status)) {
fDefaultCenturyStart = startDate;
fDefaultCenturyStartYear = fCalendar->get(Calendar::YEAR, status);
}
@ -406,7 +406,7 @@ SimpleDateFormat::format(UDate date, UnicodeString& toAppendTo, FieldPosition& p
UnicodeString str;
// loop through the pattern string character by character
for (int32_t i = 0; i < fPattern.size() && SUCCESS(status); ++i) {
for (int32_t i = 0; i < fPattern.size() && U_SUCCESS(status); ++i) {
UChar ch = fPattern[i];
// Use subFormat() to format a repeated pattern character
@ -446,7 +446,7 @@ SimpleDateFormat::format(UDate date, UnicodeString& toAppendTo, FieldPosition& p
// and if something failed (e.g., an invalid format character), reset our FieldPosition
// to (0, 0) to show that
// {sfb} look at this later- are these being set correctly?
if (FAILURE(status)) {
if (U_FAILURE(status)) {
pos.setBeginIndex(0);
pos.setEndIndex(0);
}
@ -523,7 +523,7 @@ SimpleDateFormat::subFormat(UnicodeString& result,
Calendar::EDateFields field = fgPatternIndexToCalendarField[patternCharIndex];
int32_t value = fCalendar->get(field, status);
if (FAILURE(status)) return result;
if (U_FAILURE(status)) return result;
switch (patternCharIndex) {
@ -615,9 +615,9 @@ SimpleDateFormat::subFormat(UnicodeString& result,
else
zoneString += fgGmtPlus;
zoneString += zeroPaddingNumber(str, (int32_t)(value/kMillisPerHour), 2, 2);
zoneString += zeroPaddingNumber(str, (int32_t)(value/U_MILLIS_PER_HOUR), 2, 2);
zoneString += 0x003A /*':'*/;
zoneString += zeroPaddingNumber(str, (int32_t)((value%kMillisPerHour)/kMillisPerMinute), 2, 2);
zoneString += zeroPaddingNumber(str, (int32_t)((value%U_MILLIS_PER_HOUR)/U_MILLIS_PER_MINUTE), 2, 2);
result = zoneString;
}
@ -954,7 +954,7 @@ SimpleDateFormat::parse(const UnicodeString& text, ParsePosition& pos) const
// If any Calendar calls failed, we pretend that we
// couldn't parse the string, when in reality this isn't quite accurate--
// we did parse it; the Calendar calls just failed.
if (FAILURE(status)) {
if (U_FAILURE(status)) {
pos.setErrorIndex(start);
pos.setIndex(oldStart);
return 0;
@ -1293,7 +1293,7 @@ int32_t SimpleDateFormat::subParse(const UnicodeString& text, int32_t& start, UC
// Must call set() with something -- TODO -- Fix this to
// use the correct DST SAVINGS for the zone.
delete tz;
fCalendar->set(Calendar::DST_OFFSET, j >= 3 ? kMillisPerHour : 0);
fCalendar->set(Calendar::DST_OFFSET, j >= 3 ? U_MILLIS_PER_HOUR : 0);
return (start + fSymbols->fZoneStrings[i][j].size());
}
}
@ -1304,7 +1304,7 @@ int32_t SimpleDateFormat::subParse(const UnicodeString& text, int32_t& start, UC
// its best with numbers that aren't strictly 4 digits long.
UErrorCode status = U_ZERO_ERROR;
DecimalFormat *fmt = new DecimalFormat("+####;-####", status);
if(FAILURE(status))
if(U_FAILURE(status))
return -start;
fmt->setParseIntegerOnly(TRUE);
// WORK AROUND BUG IN NUMBER FORMAT IN 1.2B3
@ -1333,12 +1333,12 @@ int32_t SimpleDateFormat::subParse(const UnicodeString& text, int32_t& start, UC
// arrive here if the form GMT+/-... or an RFC 822 form was seen.
if (sign != 0)
{
offset *= kMillisPerMinute * sign;
offset *= U_MILLIS_PER_MINUTE * sign;
if (fCalendar->getTimeZone().useDaylightTime())
{
fCalendar->set(Calendar::DST_OFFSET, kMillisPerHour);
offset -= kMillisPerHour;
fCalendar->set(Calendar::DST_OFFSET, U_MILLIS_PER_HOUR);
offset -= U_MILLIS_PER_HOUR;
}
fCalendar->set(Calendar::ZONE_OFFSET, offset);
@ -1397,7 +1397,7 @@ void SimpleDateFormat::translatePattern(const UnicodeString& originalPattern,
// an error if a particular "pattern character" doesn't appear in "from".
// Depending on the values of "from" and "to" this can convert from generic
// to localized patterns or localized to generic.
if (FAILURE(status))
if (U_FAILURE(status))
return;
translatedPattern.remove();
@ -1553,7 +1553,7 @@ SimpleDateFormat::initializeSystemDefaultCentury()
{
UErrorCode status = U_ZERO_ERROR;
Calendar *calendar = Calendar::createInstance(status);
if (calendar != NULL && SUCCESS(status))
if (calendar != NULL && U_SUCCESS(status))
{
calendar->setTime(Calendar::getNow(), status);
calendar->add(Calendar::YEAR, -80, status);

4
icu4c/source/i18n/smpdtfmt.h
View file

@ -449,7 +449,7 @@ public:
* </pre>
* @return The class ID for all objects of this class.
*/
static ClassID getStaticClassID(void) { return (ClassID)&fgClassID; }
static UClassID getStaticClassID(void) { return (UClassID)&fgClassID; }
/**
* Returns a unique class ID POLYMORPHICALLY. Pure virtual override. This
@ -461,7 +461,7 @@ public:
* given class have the same class ID. Objects of
* other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const { return getStaticClassID(); }
virtual UClassID getDynamicClassID(void) const { return getStaticClassID(); }
private:
static char fgClassID;

6
icu4c/source/i18n/sortkey.h
View file

@ -175,13 +175,13 @@ public :
* <pre>
* . UErrorCode status = U_ZERO_ERROR;
* . Collator *myCollation = Collator::createInstance(Locale::US, status);
* . if (FAILURE(status)) return;
* . if (U_FAILURE(status)) return;
* . CollationKey key1, key2;
* . UErrorCode status1 = U_ZERO_ERROR, status2 = U_ZERO_ERROR;
* . myCollation->getCollationKey("abc", key1, status1);
* . if (FAILURE(status1)) { delete myCollation; return; }
* . if (U_FAILURE(status1)) { delete myCollation; return; }
* . myCollation->getCollationKey("ABC", key2, status2);
* . if (FAILURE(status2)) { delete myCollation; return; }
* . if (U_FAILURE(status2)) { delete myCollation; return; }
* . // key1.hashCode() != key2.hashCode()
* </pre>
* @return the hash value based on the string's collation order.

72
icu4c/source/i18n/tblcoll.cpp
View file

@ -225,7 +225,7 @@ RuleBasedCollator::RuleBasedCollator(const UnicodeString& rules,
data(0),
dataIsOwned(FALSE)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -244,7 +244,7 @@ RuleBasedCollator::RuleBasedCollator(const UnicodeString& rules,
data(0),
dataIsOwned(FALSE)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -263,7 +263,7 @@ RuleBasedCollator::RuleBasedCollator(const UnicodeString& rules,
data(0),
dataIsOwned(FALSE)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -283,7 +283,7 @@ RuleBasedCollator::RuleBasedCollator(const UnicodeString& rules,
data(0),
dataIsOwned(FALSE)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -295,7 +295,7 @@ void RuleBasedCollator::constructFromRules(const UnicodeString& rules,
UErrorCode& status)
{
// Construct this collator's ruleset from its string representation
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -341,7 +341,7 @@ RuleBasedCollator::constructFromFile(const char* fileName,
// The 'fileName' parameter should contain a full pathname valid on
// the local environment.
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -402,7 +402,7 @@ RuleBasedCollator::RuleBasedCollator( const Locale& desiredLocale,
targetCursor(0),
mPattern(0)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -492,7 +492,7 @@ RuleBasedCollator::RuleBasedCollator( const Locale& desiredLocale,
UErrorCode intStatus = U_ZERO_ERROR;
constructFromCache(localeName, intStatus);
if (SUCCESS(intStatus))
if (U_SUCCESS(intStatus))
{
break; // Done!
}
@ -505,7 +505,7 @@ RuleBasedCollator::RuleBasedCollator( const Locale& desiredLocale,
// and try to get the collation table there.
intStatus = U_ZERO_ERROR;
constructFromFile(desiredLocale, localeName, TRUE, intStatus);
if (SUCCESS(intStatus))
if (U_SUCCESS(intStatus))
{
// If we succeeded in loading the collation from a file, now is the
// time to add it to the in-memory cache. We record the real
@ -557,7 +557,7 @@ RuleBasedCollator::constructFromFile( const Locale& locale,
// If tryBinaryFile is true, then try to load from the binary file first.
if(FAILURE(status)) {
if(U_FAILURE(status)) {
return;
}
@ -575,7 +575,7 @@ RuleBasedCollator::constructFromFile( const Locale& locale,
#ifdef COLLDEBUG
cerr << localeFileName << " binary load " << errorName(status) << endl;
#endif
if(SUCCESS(status) || status == U_MEMORY_ALLOCATION_ERROR)
if(U_SUCCESS(status) || status == U_MEMORY_ALLOCATION_ERROR)
return;
}
@ -583,7 +583,7 @@ RuleBasedCollator::constructFromFile( const Locale& locale,
ResourceBundle bundle(Locale::getDataDirectory(), localeFileName, status);
// if there is no resource bundle file for the give locale, break out
if(FAILURE(status))
if(U_FAILURE(status))
return;
#ifdef COLLDEBUG
@ -602,7 +602,7 @@ RuleBasedCollator::constructFromFile( const Locale& locale,
}
// if this bundle doesn't contain collation data, break out
if(FAILURE(intStatus)) {
if(U_FAILURE(intStatus)) {
status = U_MISSING_RESOURCE_ERROR;
return;
}
@ -635,10 +635,10 @@ RuleBasedCollator::constructFromFile( const Locale& locale,
}
#ifdef COLLDEBUG
cerr << localeFileName << " ascii load " << (SUCCESS(status) ? "OK" : "Failed") << endl;
cerr << localeFileName << " ascii load " << (U_SUCCESS(status) ? "OK" : "Failed") << endl;
#endif
if(SUCCESS(status) && tryBinaryFile) {
if(U_SUCCESS(status) && tryBinaryFile) {
// If we get a RuleBasedCollator result, even if it is derived
// from a default or a fallback, then we write it out as a
// binary file to the disk. The next time the system wants to
@ -686,7 +686,7 @@ RuleBasedCollator::createCollationElementIterator(const UnicodeString& source) c
CollationElementIterator *newCursor = 0;
newCursor = new CollationElementIterator(source, this, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
return NULL;
}
@ -703,7 +703,7 @@ RuleBasedCollator::createCollationElementIterator(const CharacterIterator& sourc
CollationElementIterator *newCursor = 0;
newCursor = new CollationElementIterator(source, this, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
return NULL;
}
@ -742,7 +742,7 @@ RuleBasedCollator::getRules() const
// We must check that mPattern is nonzero here, or we run the risk
// of an infinite loop.
if (SUCCESS(status) && temp.mPattern != 0)
if (U_SUCCESS(status) && temp.mPattern != 0)
{
data->ruleTable = temp.getRules();
data->isRuleTableLoaded = TRUE;
@ -833,7 +833,7 @@ RuleBasedCollator::compare(const UnicodeString& source,
sourceCursor->setText(source, status);
}
if (sourceCursor == NULL || FAILURE(status))
if (sourceCursor == NULL || U_FAILURE(status))
{
return Collator::EQUAL;
}
@ -847,7 +847,7 @@ RuleBasedCollator::compare(const UnicodeString& source,
targetCursor->setText(target, status);
}
if (targetCursor == NULL || FAILURE(status))
if (targetCursor == NULL || U_FAILURE(status))
{
return Collator::EQUAL;
}
@ -868,7 +868,7 @@ RuleBasedCollator::compare(const UnicodeString& source,
{
sOrder = sourceCursor->next(status);
if (FAILURE(status))
if (U_FAILURE(status))
{
return Collator::EQUAL;
}
@ -880,7 +880,7 @@ RuleBasedCollator::compare(const UnicodeString& source,
{
tOrder = targetCursor->next(status);
if (FAILURE(status))
if (U_FAILURE(status))
{
return Collator::EQUAL;
}
@ -1141,7 +1141,7 @@ RuleBasedCollator::getCollationKey( const UnicodeString& source,
CollationKey& sortkey,
UErrorCode& status) const
{
if (FAILURE(status))
if (U_FAILURE(status))
{
status = U_ILLEGAL_ARGUMENT_ERROR;
return sortkey.setToBogus();
@ -1167,7 +1167,7 @@ RuleBasedCollator::getCollationKey( const UnicodeString& source,
sourceCursor->setText(source, status);
}
if (sourceCursor == NULL || FAILURE(status))
if (sourceCursor == NULL || U_FAILURE(status))
{
return sortkey.setToBogus();
}
@ -1188,7 +1188,7 @@ RuleBasedCollator::getCollationKey( const UnicodeString& source,
int32_t secOrder = CollationElementIterator::secondaryOrder(order);
int32_t terOrder = CollationElementIterator::tertiaryOrder(order);
if (FAILURE(status))
if (U_FAILURE(status))
{
return sortkey.setToBogus();
}
@ -1239,7 +1239,7 @@ RuleBasedCollator::getCollationKey( const UnicodeString& source,
Normalizer::normalize(source, getDecomposition(),
0, decomp, status);
if (SUCCESS(status))
if (U_SUCCESS(status))
{
totalIdent = decomp.size() + 1;
}
@ -1270,7 +1270,7 @@ RuleBasedCollator::getCollationKey( const UnicodeString& source,
// now iterate over the source computing the actual entries
while((order = sourceCursor->next(status)) != CollationElementIterator::NULLORDER)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return sortkey.reset();
}
@ -1353,7 +1353,7 @@ void
RuleBasedCollator::build(const UnicodeString& pattern,
UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -1388,7 +1388,7 @@ RuleBasedCollator::build(const UnicodeString& pattern,
// "C < CH" rule in just before the "C < D" rule.
mPattern = new MergeCollation(pattern, getDecomposition(), status);
if (FAILURE(status))
if (U_FAILURE(status))
{
ucmp32_close(data->mapping);
data->mapping = 0;
@ -1426,7 +1426,7 @@ RuleBasedCollator::build(const UnicodeString& pattern,
// encountered an expanding character, where one character on input
// expands to several sort elements (e.g. 'ö' --> 'o' 'e')
addExpandOrder(groupChars, expChars, order, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -1437,7 +1437,7 @@ RuleBasedCollator::build(const UnicodeString& pattern,
// contract into one sort order. For example, "ch" is treated as a single
// character in traditional Spanish sorting.
addContractOrder(groupChars, order, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -1446,7 +1446,7 @@ RuleBasedCollator::build(const UnicodeString& pattern,
{
// Nothing out of the ordinary -- one character maps to one sort order
addOrder(groupChars[0], order, status);
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -1633,7 +1633,7 @@ RuleBasedCollator::addOrder(UChar ch,
int32_t anOrder,
UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -1670,7 +1670,7 @@ RuleBasedCollator::addExpandOrder( const UnicodeString& contractChars,
int32_t anOrder,
UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -1742,7 +1742,7 @@ RuleBasedCollator::addContractOrder(const UnicodeString& groupChars,
bool_t fwd,
UErrorCode& status)
{
if (FAILURE(status))
if (U_FAILURE(status))
{
return;
}
@ -2147,7 +2147,7 @@ RuleBasedCollator::constructFromCache(const UnicodeString& key,
{
// Attempt to construct this RuleBasedCollator object from cached TableCollationData.
// If no such data is in the cache, return false.
if (FAILURE(status)) return;
if (U_FAILURE(status)) return;
if (dataIsOwned)
{
delete data;

6
icu4c/source/i18n/tblcoll.h
View file

@ -293,7 +293,7 @@ class RuleBasedCollatorStreamer;
* . RuleBasedCollator* en_USCollation =
* . (RuleBasedCollator*) Collator::createInstance(Locale::US, status);
* . // Always check the error code after each call.
* . if (FAILURE(status)) return;
* . if (U_FAILURE(status)) return;
* . // add a few Japanese character to sort before English characters
* . // suppose the last character before the first base letter 'a' in
* . // the English collation rule is 0x2212
@ -476,7 +476,7 @@ public :
* given class have the same class ID. Objects of
* other classes have different class IDs.
*/
virtual ClassID getDynamicClassID(void) const
virtual UClassID getDynamicClassID(void) const
{ return RuleBasedCollator::getStaticClassID(); }
@ -490,7 +490,7 @@ public :
*
* @return The class ID for all objects of this class.
*/
static ClassID getStaticClassID(void) { return (ClassID)&fgClassID; }
static UClassID getStaticClassID(void) { return (UClassID)&fgClassID; }
/*****************************************************************************
* PRIVATE

1134
icu4c/source/i18n/timezone.cpp
View file

File diff suppressed because it is too large Load diff

28
icu4c/source/i18n/ubrk.cpp
View file

@ -18,14 +18,14 @@
#include "ustring.h"
#include "uchriter.h"
CAPI UBreakIterator*
U_CAPI UBreakIterator*
ubrk_open(UBreakIteratorType type,
const char *locale,
const UChar *text,
int32_t textLength,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
BreakIterator *result = 0;
@ -67,75 +67,75 @@ ubrk_open(UBreakIteratorType type,
return (UBreakIterator*)result;
}
CAPI UBreakIterator*
U_CAPI UBreakIterator*
ubrk_openRules(const UChar *rules,
int32_t rulesLength,
const UChar *text,
int32_t textLength,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
return 0;
}
CAPI void
U_CAPI void
ubrk_close(UBreakIterator *bi)
{
delete (BreakIterator*) bi;
}
CAPI UTextOffset
U_CAPI UTextOffset
ubrk_current(const UBreakIterator *bi)
{
return ((BreakIterator*)bi)->current();
}
CAPI UTextOffset
U_CAPI UTextOffset
ubrk_next(UBreakIterator *bi)
{
return ((BreakIterator*)bi)->next();
}
CAPI UTextOffset
U_CAPI UTextOffset
ubrk_previous(UBreakIterator *bi)
{
return ((BreakIterator*)bi)->previous();
}
CAPI UTextOffset
U_CAPI UTextOffset
ubrk_first(UBreakIterator *bi)
{
return ((BreakIterator*)bi)->first();
}
CAPI UTextOffset
U_CAPI UTextOffset
ubrk_last(UBreakIterator *bi)
{
return ((BreakIterator*)bi)->last();
}
CAPI UTextOffset
U_CAPI UTextOffset
ubrk_preceding(UBreakIterator *bi,
UTextOffset offset)
{
return ((BreakIterator*)bi)->preceding(offset);
}
CAPI UTextOffset
U_CAPI UTextOffset
ubrk_following(UBreakIterator *bi,
UTextOffset offset)
{
return ((BreakIterator*)bi)->following(offset);
}
CAPI const char*
U_CAPI const char*
ubrk_getAvailable(int32_t index)
{
return uloc_getAvailable(index);
}
CAPI int32_t
U_CAPI int32_t
ubrk_countAvailable()
{
return uloc_countAvailable();

76
icu4c/source/i18n/ucal.cpp
View file

@ -19,12 +19,12 @@
#include "ustring.h"
#include "cpputils.h"
CAPI const UChar*
U_CAPI const UChar*
ucal_getAvailableTZIDs( int32_t rawOffset,
int32_t index,
UErrorCode* status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
int32_t count = 0;
const UChar *retVal = 0;
@ -46,7 +46,7 @@ ucal_getAvailableTZIDs( int32_t rawOffset,
return retVal;
}
CAPI int32_t
U_CAPI int32_t
ucal_countAvailableTZIDs(int32_t rawOffset)
{
int32_t count = 0;
@ -63,21 +63,21 @@ ucal_countAvailableTZIDs(int32_t rawOffset)
return count;
}
CAPI UDate
U_CAPI UDate
ucal_getNow()
{
return Calendar::getNow();
}
// ignore type until we add more subclasses
CAPI UCalendar*
U_CAPI UCalendar*
ucal_open( const UChar* zoneID,
int32_t len,
const char* locale,
UCalendarType type,
UErrorCode* status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
TimeZone *zone = 0;
if(zoneID == 0) {
@ -97,19 +97,19 @@ ucal_open( const UChar* zoneID,
return (UCalendar*)Calendar::createInstance(zone, Locale().init(locale), *status);
}
CAPI void
U_CAPI void
ucal_close(UCalendar *cal)
{
delete (Calendar*) cal;
}
CAPI void
U_CAPI void
ucal_setTimeZone( UCalendar* cal,
const UChar* zoneID,
int32_t len,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
TimeZone *zone = 0;
if(zone == 0) {
@ -128,7 +128,7 @@ ucal_setTimeZone( UCalendar* cal,
((Calendar*)cal)->adoptTimeZone(zone);
}
CAPI int32_t
U_CAPI int32_t
ucal_getTimeZoneDisplayName( const UCalendar* cal,
UCalendarDisplayNameType type,
const char *locale,
@ -136,7 +136,7 @@ ucal_getTimeZoneDisplayName( const UCalendar* cal,
int32_t resultLength,
UErrorCode* status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t actLen;
@ -165,15 +165,15 @@ ucal_getTimeZoneDisplayName( const UCalendar* cal,
return actLen;
}
CAPI bool_t
U_CAPI bool_t
ucal_inDaylightTime( const UCalendar* cal,
UErrorCode* status )
{
if(FAILURE(*status)) return (bool_t) -1;
if(U_FAILURE(*status)) return (bool_t) -1;
return ((Calendar*)cal)->inDaylightTime(*status);
}
CAPI int32_t
U_CAPI int32_t
ucal_getAttribute( const UCalendar* cal,
UCalendarAttribute attr)
{
@ -196,7 +196,7 @@ ucal_getAttribute( const UCalendar* cal,
}
}
CAPI void
U_CAPI void
ucal_setAttribute( UCalendar* cal,
UCalendarAttribute attr,
int32_t newValue)
@ -216,52 +216,52 @@ ucal_setAttribute( UCalendar* cal,
}
}
CAPI const char*
U_CAPI const char*
ucal_getAvailable(int32_t index)
{
return uloc_getAvailable(index);
}
CAPI int32_t
U_CAPI int32_t
ucal_countAvailable()
{
return uloc_countAvailable();
}
CAPI UDate
U_CAPI UDate
ucal_getMillis( const UCalendar* cal,
UErrorCode* status)
{
if(FAILURE(*status)) return (UDate) 0;
if(U_FAILURE(*status)) return (UDate) 0;
return ((Calendar*)cal)->getTime(*status);
}
CAPI void
U_CAPI void
ucal_setMillis( UCalendar* cal,
UDate dateTime,
UErrorCode* status )
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->setTime(dateTime, *status);
}
// TBD: why does this take an UErrorCode?
CAPI void
U_CAPI void
ucal_setDate( UCalendar* cal,
int32_t year,
int32_t month,
int32_t date,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->set(year, month, date);
}
// TBD: why does this take an UErrorCode?
CAPI void
U_CAPI void
ucal_setDateTime( UCalendar* cal,
int32_t year,
int32_t month,
@ -271,51 +271,51 @@ ucal_setDateTime( UCalendar* cal,
int32_t second,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->set(year, month, date, hour, minute, second);
}
CAPI bool_t
U_CAPI bool_t
ucal_equivalentTo( const UCalendar* cal1,
const UCalendar* cal2)
{
return ((Calendar*)cal1)->equivalentTo(*((Calendar*)cal2));
}
CAPI void
U_CAPI void
ucal_add( UCalendar* cal,
UCalendarDateFields field,
int32_t amount,
UErrorCode* status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->add((Calendar::EDateFields)field, amount, *status);
}
CAPI void
U_CAPI void
ucal_roll( UCalendar* cal,
UCalendarDateFields field,
int32_t amount,
UErrorCode* status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((Calendar*)cal)->roll((Calendar::EDateFields)field, amount, *status);
}
CAPI int32_t
U_CAPI int32_t
ucal_get( const UCalendar* cal,
UCalendarDateFields field,
UErrorCode* status )
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
return ((Calendar*)cal)->get((Calendar::EDateFields)field, *status);
}
CAPI void
U_CAPI void
ucal_set( UCalendar* cal,
UCalendarDateFields field,
int32_t value)
@ -323,33 +323,33 @@ ucal_set( UCalendar* cal,
((Calendar*)cal)->set((Calendar::EDateFields)field, value);
}
CAPI bool_t
U_CAPI bool_t
ucal_isSet( const UCalendar* cal,
UCalendarDateFields field)
{
return ((Calendar*)cal)->isSet((Calendar::EDateFields)field);
}
CAPI void
U_CAPI void
ucal_clearField( UCalendar* cal,
UCalendarDateFields field)
{
((Calendar*)cal)->clear((Calendar::EDateFields)field);
}
CAPI void
U_CAPI void
ucal_clear(UCalendar* calendar)
{
((Calendar*)calendar)->clear();
}
CAPI int32_t
U_CAPI int32_t
ucal_getLimit( const UCalendar* cal,
UCalendarDateFields field,
UCalendarLimitType type,
UErrorCode *status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
switch(type) {
case UCAL_MINIMUM:

70
icu4c/source/i18n/ucol.cpp
View file

@ -26,7 +26,7 @@
===============================================*/
#include "normlzr.h"
#include "cpputils.h"
CAPI int32_t
U_CAPI int32_t
u_normalize(const UChar* source,
int32_t sourceLength,
UNormalizationMode mode,
@ -35,7 +35,7 @@ u_normalize(const UChar* source,
int32_t resultLength,
UErrorCode* status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
Normalizer::EMode normMode;
switch(mode) {
@ -65,11 +65,11 @@ u_normalize(const UChar* source,
return actualLen;
}
CAPI UCollator*
U_CAPI UCollator*
ucol_open( const char *loc,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
Collator *col = 0;
@ -86,14 +86,14 @@ ucol_open( const char *loc,
return (UCollator*)col;
}
CAPI UCollator*
U_CAPI UCollator*
ucol_openRules( const UChar *rules,
int32_t rulesLength,
UNormalizationMode mode,
UCollationStrength strength,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
int32_t len = (rulesLength == -1 ? u_strlen(rules) : rulesLength);
const UnicodeString ruleString((UChar*)rules, len, len);
@ -131,13 +131,13 @@ ucol_openRules( const UChar *rules,
return (UCollator*) col;
}
CAPI void
U_CAPI void
ucol_close(UCollator *coll)
{
delete (Collator*)coll;
}
CAPI UCollationResult
U_CAPI UCollationResult
ucol_strcoll( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -151,7 +151,7 @@ ucol_strcoll( const UCollator *coll,
return (UCollationResult) ((Collator*)coll)->compare(tempSource, tempTarget);
}
CAPI bool_t
U_CAPI bool_t
ucol_greater( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -162,7 +162,7 @@ ucol_greater( const UCollator *coll,
== UCOL_GREATER);
}
CAPI bool_t
U_CAPI bool_t
ucol_greaterOrEqual( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -173,7 +173,7 @@ ucol_greaterOrEqual( const UCollator *coll,
!= UCOL_LESS);
}
CAPI bool_t
U_CAPI bool_t
ucol_equal( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -184,20 +184,20 @@ ucol_equal( const UCollator *coll,
== UCOL_EQUAL);
}
CAPI UCollationStrength
U_CAPI UCollationStrength
ucol_getStrength(const UCollator *coll)
{
return (UCollationStrength) ((Collator*)coll)->getStrength();
}
CAPI void
U_CAPI void
ucol_setStrength( UCollator *coll,
UCollationStrength strength)
{
((Collator*)coll)->setStrength((Collator::ECollationStrength)strength);
}
CAPI UNormalizationMode
U_CAPI UNormalizationMode
ucol_getNormalization(const UCollator* coll)
{
switch(((Collator*)coll)->getDecomposition()) {
@ -218,7 +218,7 @@ ucol_getNormalization(const UCollator* coll)
}
}
CAPI void
U_CAPI void
ucol_setNormalization( UCollator *coll,
UNormalizationMode mode)
{
@ -244,14 +244,14 @@ ucol_setNormalization( UCollator *coll,
((Collator*)coll)->setDecomposition(normMode);
}
CAPI int32_t
U_CAPI int32_t
ucol_getDisplayName( const char *objLoc,
const char *dispLoc,
UChar *result,
int32_t resultLength,
UErrorCode *status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
UnicodeString dst(result, resultLength, resultLength);
Collator::getDisplayName(Locale().init(objLoc), Locale().init(dispLoc), dst);
@ -260,19 +260,19 @@ ucol_getDisplayName( const char *objLoc,
return actLen;
}
CAPI const char*
U_CAPI const char*
ucol_getAvailable(int32_t index)
{
return uloc_getAvailable(index);
}
CAPI int32_t
U_CAPI int32_t
ucol_countAvailable()
{
return uloc_countAvailable();
}
CAPI const UChar*
U_CAPI const UChar*
ucol_getRules( const UCollator *coll,
int32_t *length)
{
@ -281,7 +281,7 @@ ucol_getRules( const UCollator *coll,
return rules.getUChars();
}
CAPI int32_t
U_CAPI int32_t
ucol_getSortKey(const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -298,7 +298,7 @@ ucol_getSortKey(const UCollator *coll,
UErrorCode status = U_ZERO_ERROR;
((Collator*)coll)->getCollationKey(string, key, status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
bytes = key.getByteArray(count);
@ -313,7 +313,7 @@ ucol_getSortKey(const UCollator *coll,
return count;
}
CAPI int32_t
U_CAPI int32_t
ucol_keyHashCode( const uint8_t* key,
int32_t length)
{
@ -340,50 +340,50 @@ ucol_openElements( const UCollator *coll,
return (UCollationElements*) iter;
}
CAPI void
U_CAPI void
ucol_closeElements(UCollationElements *elems)
{
delete (CollationElementIterator*)elems;
}
CAPI void
U_CAPI void
ucol_reset(UCollationElements *elems)
{
((CollationElementIterator*)elems)->reset();
}
CAPI int32_t
U_CAPI int32_t
ucol_next( UCollationElements *elems,
UErrorCode *status)
{
if(FAILURE(*status)) return UCOL_NULLORDER;
if(U_FAILURE(*status)) return UCOL_NULLORDER;
return ((CollationElementIterator*)elems)->next(*status);
}
CAPI int32_t
U_CAPI int32_t
ucol_previous( UCollationElements *elems,
UErrorCode *status)
{
if(FAILURE(*status)) return UCOL_NULLORDER;
if(U_FAILURE(*status)) return UCOL_NULLORDER;
return ((CollationElementIterator*)elems)->previous(*status);
}
CAPI int32_t
U_CAPI int32_t
ucol_getMaxExpansion( const UCollationElements *elems,
int32_t order)
{
return ((CollationElementIterator*)elems)->getMaxExpansion(order);
}
CAPI void
U_CAPI void
ucol_setText(UCollationElements *elems,
const UChar *text,
int32_t textLength,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
int32_t len = (textLength == -1 ? u_strlen(text) : textLength);
const UnicodeString src((UChar*)text, len, len);
@ -391,18 +391,18 @@ ucol_setText(UCollationElements *elems,
((CollationElementIterator*)elems)->setText(src, *status);
}
CAPI UTextOffset
U_CAPI UTextOffset
ucol_getOffset(const UCollationElements *elems)
{
return ((CollationElementIterator*)elems)->getOffset();
}
CAPI void
U_CAPI void
ucol_setOffset( UCollationElements *elems,
UTextOffset offset,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((CollationElementIterator*)elems)->setOffset(offset, *status);
}

56
icu4c/source/i18n/ucol.h
View file

@ -266,7 +266,7 @@ typedef enum UCollationStrength UCollationStrength;
* @return The total buffer size needed; if greater than resultLength,
* the output was truncated.
*/
CAPI int32_t
U_CAPI int32_t
u_normalize(const UChar* source,
int32_t sourceLength,
UNormalizationMode mode,
@ -283,7 +283,7 @@ u_normalize(const UChar* source,
* @return A pointer to a UCollator, or 0 if an error occurred.
* @see ucol_openRules
*/
CAPI UCollator*
U_CAPI UCollator*
ucol_open( const char *loc,
UErrorCode *status);
@ -301,7 +301,7 @@ ucol_open( const char *loc,
* @return A pointer to a UCollator, or 0 if an error occurred.
* @see ucol_open
*/
CAPI UCollator*
U_CAPI UCollator*
ucol_openRules( const UChar *rules,
int32_t rulesLength,
UNormalizationMode mode,
@ -313,7 +313,7 @@ ucol_openRules( const UChar *rules,
* Once closed, a UCollator should not be used.
* @param coll The UCollator to close.
*/
CAPI void
U_CAPI void
ucol_close(UCollator *coll);
/**
@ -331,7 +331,7 @@ ucol_close(UCollator *coll);
* @see ucol_greaterOrEqual
* @see ucol_equal
*/
CAPI UCollationResult
U_CAPI UCollationResult
ucol_strcoll( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -351,7 +351,7 @@ ucol_strcoll( const UCollator *coll,
* @see ucol_greaterOrEqual
* @see ucol_equal
*/
CAPI bool_t
U_CAPI bool_t
ucol_greater( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -371,7 +371,7 @@ ucol_greater( const UCollator *coll,
* @see ucol_greater
* @see ucol_equal
*/
CAPI bool_t
U_CAPI bool_t
ucol_greaterOrEqual( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -391,7 +391,7 @@ ucol_greaterOrEqual( const UCollator *coll,
* @see ucol_greater
* @see ucol_greaterOrEqual
*/
CAPI bool_t
U_CAPI bool_t
ucol_equal( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -406,7 +406,7 @@ ucol_equal( const UCollator *coll,
* UCOL_TERTIARY, UCOL_IDENTICAL, UCOL_DEFAULT_STRENGTH
* @see ucol_setStrength
*/
CAPI UCollationStrength
U_CAPI UCollationStrength
ucol_getStrength(const UCollator *coll);
/**
@ -418,7 +418,7 @@ ucol_getStrength(const UCollator *coll);
* . UChar *source, *target;
* . UErrorCode status = U_ZERO_ERROR;
* . UCollator *myCollation = ucol_open("en_US", status);
* . if (FAILURE(&status)) return;
* . if (U_FAILURE(&status)) return;
* . ucol_setStrength(myCollation, UCOL_PRIMARY);
* . u_uastrcpy(source, "abc");
* . u_uastrcpy(target, "ABC");
@ -431,7 +431,7 @@ ucol_getStrength(const UCollator *coll);
* UCOL_SECONDARY, UCOL_TERTIARY, UCOL_IDENTICAL, UCOL_DEFAULT_STRENGTH
* @see ucol_getStrength
*/
CAPI void
U_CAPI void
ucol_setStrength( UCollator *coll,
UCollationStrength strength);
@ -444,7 +444,7 @@ ucol_setStrength( UCollator *coll,
* UCOL_COMPAT_DECOMP_CAN_COMP, UCOL_DEFAULT_NORMALIZATION
* @see ucol_setNormalization
*/
CAPI UNormalizationMode
U_CAPI UNormalizationMode
ucol_getNormalization(const UCollator* coll);
/**
@ -456,7 +456,7 @@ ucol_getNormalization(const UCollator* coll);
* UCOL_COMPAT_DECOMP_CAN_COMP, UCOL_DEFAULT_NORMALIZATION
* @see ucol_getNormalization
*/
CAPI void
U_CAPI void
ucol_setNormalization( UCollator *coll,
UNormalizationMode mode);
@ -471,7 +471,7 @@ ucol_setNormalization( UCollator *coll,
* @return The total buffer size needed; if greater than resultLength,
* the output was truncated.
*/
CAPI int32_t
U_CAPI int32_t
ucol_getDisplayName( const char *objLoc,
const char *dispLoc,
UChar *result,
@ -486,7 +486,7 @@ ucol_getDisplayName( const char *objLoc,
* @return A locale for which collation rules are available, or 0 if none.
* @see ucol_countAvailable
*/
CAPI const char*
U_CAPI const char*
ucol_getAvailable(int32_t index);
/**
@ -496,7 +496,7 @@ ucol_getAvailable(int32_t index);
* @return The number of locales for which collation rules are available.
* @see ucol_getAvailable
*/
CAPI int32_t
U_CAPI int32_t
ucol_countAvailable(void);
/**
@ -506,7 +506,7 @@ ucol_countAvailable(void);
* @param length
* @return The collation rules.
*/
CAPI const UChar*
U_CAPI const UChar*
ucol_getRules( const UCollator *coll,
int32_t *length);
@ -521,7 +521,7 @@ ucol_getRules( const UCollator *coll,
* @return The size needed to fully store the sort key..
* @see ucol_keyHashCode
*/
CAPI int32_t
U_CAPI int32_t
ucol_getSortKey(const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@ -536,7 +536,7 @@ ucol_getSortKey(const UCollator *coll,
* @return A hash code for key.
* @see ucol_getSortKey
*/
CAPI int32_t
U_CAPI int32_t
ucol_keyHashCode( const uint8_t* key,
int32_t length);
@ -599,7 +599,7 @@ typedef struct UCollationElements UCollationElements;
* @param textLength The number of characters in text, or -1 if null-terminated
* @param status A pointer to an UErrorCode to receive any errors.
*/
CAPI UCollationElements*
U_CAPI UCollationElements*
ucol_openElements( const UCollator *coll,
const UChar *text,
int32_t textLength,
@ -622,7 +622,7 @@ ucol_openElements( const UCollator *coll,
* Once closed, a UCollationElements may no longer be used.
* @param elems The UCollationElements to close.
*/
CAPI void
U_CAPI void
ucol_closeElements(UCollationElements *elems);
/**
@ -632,7 +632,7 @@ ucol_closeElements(UCollationElements *elems);
* @see ucol_next
* @see ucol_previous
*/
CAPI void
U_CAPI void
ucol_reset(UCollationElements *elems);
/**
@ -643,7 +643,7 @@ ucol_reset(UCollationElements *elems);
* @return The next collation elements ordering, or \Ref{UCOL_NULLORDER} if the
* end of the text is reached.
*/
CAPI int32_t
U_CAPI int32_t
ucol_next( UCollationElements *elems,
UErrorCode *status);
@ -655,7 +655,7 @@ ucol_next( UCollationElements *elems,
* @return The previous collation elements ordering, or \Ref{UCOL_NULLORDER}
* if the end of the text is reached.
*/
CAPI int32_t
U_CAPI int32_t
ucol_previous( UCollationElements *elems,
UErrorCode *status);
@ -668,7 +668,7 @@ ucol_previous( UCollationElements *elems,
* @return The maximum length of any expansion sequences ending with the
* specified order.
*/
CAPI int32_t
U_CAPI int32_t
ucol_getMaxExpansion( const UCollationElements *elems,
int32_t order);
@ -681,7 +681,7 @@ ucol_getMaxExpansion( const UCollationElements *elems,
* @param status A pointer to an UErrorCode to receive any errors.
* @see ucol_getText
*/
CAPI void
U_CAPI void
ucol_setText( UCollationElements *elems,
const UChar *text,
int32_t textLength,
@ -695,7 +695,7 @@ ucol_setText( UCollationElements *elems,
* @return The offset of the current source character.
* @see ucol_setOffset
*/
CAPI UTextOffset
U_CAPI UTextOffset
ucol_getOffset(const UCollationElements *elems);
/**
@ -706,7 +706,7 @@ ucol_getOffset(const UCollationElements *elems);
* @param status A pointer to an UErrorCode to receive any errors.
* @see ucol_getOffset
*/
CAPI void
U_CAPI void
ucol_setOffset( UCollationElements *elems,
UTextOffset offset,
UErrorCode *status);

62
icu4c/source/i18n/udat.cpp
View file

@ -25,7 +25,7 @@
#include "dtfmtsym.h"
#include "ustring.h"
CAPI UDateFormat*
U_CAPI UDateFormat*
udat_open( UDateFormatStyle timeStyle,
UDateFormatStyle dateStyle,
const char* locale,
@ -33,7 +33,7 @@ udat_open( UDateFormatStyle timeStyle,
int32_t tzIDLength,
UErrorCode* status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
DateFormat *fmt;
if(locale == 0)
@ -65,13 +65,13 @@ udat_open( UDateFormatStyle timeStyle,
return (UDateFormat*)fmt;
}
CAPI UDateFormat*
U_CAPI UDateFormat*
udat_openPattern( const UChar *pattern,
int32_t patternLength,
const char *locale,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
int32_t len = (patternLength == -1 ? u_strlen(pattern) : patternLength);
UDateFormat *retVal = 0;
@ -93,17 +93,17 @@ udat_openPattern( const UChar *pattern,
return retVal;
}
CAPI void
U_CAPI void
udat_close(UDateFormat* format)
{
delete (DateFormat*)format;
}
CAPI UDateFormat*
U_CAPI UDateFormat*
udat_clone(const UDateFormat *fmt,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
Format *res = ((SimpleDateFormat*)fmt)->clone();
@ -115,7 +115,7 @@ udat_clone(const UDateFormat *fmt,
return (UDateFormat*) res;
}
CAPI int32_t
U_CAPI int32_t
udat_format( const UDateFormat* format,
UDate dateToFormat,
UChar* result,
@ -123,7 +123,7 @@ udat_format( const UDateFormat* format,
UFieldPosition* position,
UErrorCode* status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t actLen;
@ -144,14 +144,14 @@ udat_format( const UDateFormat* format,
return actLen;
}
CAPI UDate
U_CAPI UDate
udat_parse( const UDateFormat* format,
const UChar* text,
int32_t textLength,
int32_t *parsePos,
UErrorCode *status)
{
if(FAILURE(*status)) return (UDate)0;
if(U_FAILURE(*status)) return (UDate)0;
int32_t len = (textLength == -1 ? u_strlen(text) : textLength);
const UnicodeString src((UChar*)text, len, len);
@ -175,82 +175,82 @@ udat_parse( const UDateFormat* format,
return res;
}
CAPI bool_t
U_CAPI bool_t
udat_isLenient(const UDateFormat* fmt)
{
return ((DateFormat*)fmt)->isLenient();
}
CAPI void
U_CAPI void
udat_setLenient( UDateFormat* fmt,
bool_t isLenient)
{
((DateFormat*)fmt)->setLenient(isLenient);
}
CAPI const UCalendar*
U_CAPI const UCalendar*
udat_getCalendar(const UDateFormat* fmt)
{
return (const UCalendar*) ((DateFormat*)fmt)->getCalendar();
}
CAPI void
U_CAPI void
udat_setCalendar( UDateFormat* fmt,
const UCalendar* calendarToSet)
{
((DateFormat*)fmt)->setCalendar(*((Calendar*)calendarToSet));
}
CAPI const UNumberFormat*
U_CAPI const UNumberFormat*
udat_getNumberFormat(const UDateFormat* fmt)
{
return (const UNumberFormat*) ((DateFormat*)fmt)->getNumberFormat();
}
CAPI void
U_CAPI void
udat_setNumberFormat( UDateFormat* fmt,
const UNumberFormat* numberFormatToSet)
{
((DateFormat*)fmt)->setNumberFormat(*((NumberFormat*)numberFormatToSet));
}
CAPI const char*
U_CAPI const char*
udat_getAvailable(int32_t index)
{
return uloc_getAvailable(index);
}
CAPI int32_t
U_CAPI int32_t
udat_countAvailable()
{
return uloc_countAvailable();
}
CAPI UDate
U_CAPI UDate
udat_get2DigitYearStart( const UDateFormat *fmt,
UErrorCode *status)
{
if(FAILURE(*status)) return (UDate)0;
if(U_FAILURE(*status)) return (UDate)0;
return ((SimpleDateFormat*)fmt)->get2DigitYearStart(*status);
}
CAPI void
U_CAPI void
udat_set2DigitYearStart( UDateFormat *fmt,
UDate d,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
((SimpleDateFormat*)fmt)->set2DigitYearStart(d, *status);
}
CAPI int32_t
U_CAPI int32_t
udat_toPattern( const UDateFormat *fmt,
bool_t localized,
UChar *result,
int32_t resultLength,
UErrorCode *status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t actLen;
@ -266,7 +266,7 @@ udat_toPattern( const UDateFormat *fmt,
}
// TBD: should this take an UErrorCode?
CAPI void
U_CAPI void
udat_applyPattern( UDateFormat *format,
bool_t localized,
const UChar *pattern,
@ -282,7 +282,7 @@ udat_applyPattern( UDateFormat *format,
((SimpleDateFormat*)format)->applyPattern(pat);
}
CAPI int32_t
U_CAPI int32_t
udat_getSymbols(const UDateFormat *fmt,
UDateFormatSymbolType type,
int32_t index,
@ -290,7 +290,7 @@ udat_getSymbols(const UDateFormat *fmt,
int32_t resultLength,
UErrorCode *status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t actLen;
@ -359,7 +359,7 @@ udat_getSymbols(const UDateFormat *fmt,
return actLen;
}
CAPI int32_t
U_CAPI int32_t
udat_countSymbols( const UDateFormat *fmt,
UDateFormatSymbolType type)
{
@ -400,7 +400,7 @@ udat_countSymbols( const UDateFormat *fmt,
return count;
}
CAPI void
U_CAPI void
udat_setSymbols( UDateFormat *format,
UDateFormatSymbolType type,
int32_t index,
@ -408,7 +408,7 @@ udat_setSymbols( UDateFormat *format,
int32_t valueLength,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
int32_t count;
int32_t len = (valueLength == -1 ? u_strlen(value) : valueLength);

42
icu4c/source/i18n/udat.h
View file

@ -133,7 +133,7 @@ typedef enum UDateFormatStyle UDateFormatStyle;
* an error occurred.
* @see udat_openPattern
*/
CAPI UDateFormat*
U_CAPI UDateFormat*
udat_open(UDateFormatStyle timeStyle,
UDateFormatStyle dateStyle,
const char *locale,
@ -153,7 +153,7 @@ udat_open(UDateFormatStyle timeStyle,
* an error occurred.
* @see udat_open
*/
CAPI UDateFormat*
U_CAPI UDateFormat*
udat_openPattern( const UChar *pattern,
int32_t patternLength,
const char *locale,
@ -164,7 +164,7 @@ udat_openPattern( const UChar *pattern,
* Once closed, a UDateFormat may no longer be used.
* @param fmt The formatter to close.
*/
CAPI void
U_CAPI void
udat_close(UDateFormat* format);
/**
@ -174,7 +174,7 @@ udat_close(UDateFormat* format);
* @param status A pointer to an UErrorCode to receive any errors.
* @return A pointer to a UDateFormat identical to fmt.
*/
CAPI UDateFormat*
U_CAPI UDateFormat*
udat_clone(const UDateFormat *fmt,
UErrorCode *status);
@ -191,7 +191,7 @@ udat_clone(const UDateFormat *fmt,
* @return The total buffer size needed; if greater than resultLength, the output was truncated.
* @see udat_parse
*/
CAPI int32_t
U_CAPI int32_t
udat_format( const UDateFormat* format,
UDate dateToFormat,
UChar* result,
@ -212,7 +212,7 @@ udat_format( const UDateFormat* format,
* @return The value of the parsed date/time
* @see udat_format
*/
CAPI UDate
U_CAPI UDate
udat_parse( const UDateFormat* format,
const UChar* text,
int32_t textLength,
@ -227,7 +227,7 @@ udat_parse( const UDateFormat* format,
* @return TRUE if fmt is set to perform lenient parsing, FALSE otherwise.
* @see udat_setLenient
*/
CAPI bool_t
U_CAPI bool_t
udat_isLenient(const UDateFormat* fmt);
/**
@ -238,7 +238,7 @@ udat_isLenient(const UDateFormat* fmt);
* @param isLenient TRUE if fmt should perform lenient parsing, FALSE otherwise.
* @see dat_isLenient
*/
CAPI void
U_CAPI void
udat_setLenient( UDateFormat* fmt,
bool_t isLenient);
@ -250,7 +250,7 @@ udat_setLenient( UDateFormat* fmt,
* @return A pointer to the UCalendar used by fmt.
* @see udat_setCalendar
*/
CAPI const UCalendar*
U_CAPI const UCalendar*
udat_getCalendar(const UDateFormat* fmt);
/**
@ -261,7 +261,7 @@ udat_getCalendar(const UDateFormat* fmt);
* @param calendarToSet A pointer to an UCalendar to be used by fmt.
* @see udat_setCalendar
*/
CAPI void
U_CAPI void
udat_setCalendar( UDateFormat* fmt,
const UCalendar* calendarToSet);
@ -273,7 +273,7 @@ udat_setCalendar( UDateFormat* fmt,
* @return A pointer to the UNumberFormat used by fmt to format numbers.
* @see udat_setNumberFormat
*/
CAPI const UNumberFormat*
U_CAPI const UNumberFormat*
udat_getNumberFormat(const UDateFormat* fmt);
/**
@ -284,7 +284,7 @@ udat_getNumberFormat(const UDateFormat* fmt);
* @param numberFormatToSet A pointer to the UNumberFormat to be used by fmt to format numbers.
* @see udat_getNumberFormat
*/
CAPI void
U_CAPI void
udat_setNumberFormat( UDateFormat* fmt,
const UNumberFormat* numberFormatToSet);
@ -296,7 +296,7 @@ udat_setNumberFormat( UDateFormat* fmt,
* @return A locale for which date/time formatting patterns are available, or 0 if none.
* @see udat_countAvailable
*/
CAPI const char*
U_CAPI const char*
udat_getAvailable(int32_t index);
/**
@ -306,7 +306,7 @@ udat_getAvailable(int32_t index);
* @return The number of locales for which date/time formatting patterns are available.
* @see udat_getAvailable
*/
CAPI int32_t
U_CAPI int32_t
udat_countAvailable(void);
/**
@ -318,7 +318,7 @@ udat_countAvailable(void);
* @return The year relative to which all 2-digit years are interpreted.
* @see udat_Set2DigitYearStart
*/
CAPI UDate
U_CAPI UDate
udat_get2DigitYearStart( const UDateFormat *fmt,
UErrorCode *status);
@ -331,7 +331,7 @@ udat_get2DigitYearStart( const UDateFormat *fmt,
* @param status A pointer to an UErrorCode to receive any errors
* @see udat_Set2DigitYearStart
*/
CAPI void
U_CAPI void
udat_set2DigitYearStart( UDateFormat *fmt,
UDate d,
UErrorCode *status);
@ -347,7 +347,7 @@ udat_set2DigitYearStart( UDateFormat *fmt,
* @return The total buffer size needed; if greater than resultLength, the output was truncated.
* @see udat_applyPattern
*/
CAPI int32_t
U_CAPI int32_t
udat_toPattern( const UDateFormat *fmt,
bool_t localized,
UChar *result,
@ -363,7 +363,7 @@ udat_toPattern( const UDateFormat *fmt,
* @param patternLength The length of pattern, or -1 if null-terminated.
* @see udat_toPattern
*/
CAPI void
U_CAPI void
udat_applyPattern( UDateFormat *format,
bool_t localized,
const UChar *pattern,
@ -407,7 +407,7 @@ typedef struct UDateFormatSymbols UDateFormatSymbols;
* @see udat_countSymbols
* @see udat_setSymbols
*/
CAPI int32_t
U_CAPI int32_t
udat_getSymbols(const UDateFormat *fmt,
UDateFormatSymbolType type,
int32_t index,
@ -426,7 +426,7 @@ udat_getSymbols(const UDateFormat *fmt,
* @see udat_getSymbols
* @see udat_setSymbols
*/
CAPI int32_t
U_CAPI int32_t
udat_countSymbols( const UDateFormat *fmt,
UDateFormatSymbolType type);
@ -445,7 +445,7 @@ udat_countSymbols( const UDateFormat *fmt,
* @see udat_getSymbols
* @see udat_countSymbols
*/
CAPI void
U_CAPI void
udat_setSymbols( UDateFormat *format,
UDateFormatSymbolType type,
int32_t index,

16
icu4c/source/i18n/umsg.cpp
View file

@ -169,7 +169,7 @@ umsg_getNumberFormat(UErrorCode& status)
if(theFormat == 0) {
theFormat = NumberFormat::createInstance(Locale::US, status);
if(FAILURE(status))
if(U_FAILURE(status))
return 0;
theFormat->setParseIntegerOnly(TRUE);
}
@ -198,7 +198,7 @@ umsg_stoi(const UnicodeString& string,
{
NumberFormat *myFormat = umsg_getNumberFormat(status);
if(FAILURE(status))
if(U_FAILURE(status))
return -1; // OK?
Formattable result;
@ -208,7 +208,7 @@ umsg_stoi(const UnicodeString& string,
umsg_releaseNumberFormat(myFormat);
int32_t value = 0;
if(SUCCESS(status) && result.getType() == Formattable::kLong)
if(U_SUCCESS(status) && result.getType() == Formattable::kLong)
value = result.getLong();
return value;
@ -221,7 +221,7 @@ umsg_itos(int32_t i,
UErrorCode status = U_ZERO_ERROR;
NumberFormat *myFormat = umsg_getNumberFormat(status);
if(FAILURE(status))
if(U_FAILURE(status))
return (string = "<ERROR>");
myFormat->format(i, string);
@ -242,7 +242,7 @@ umsg_itos(int32_t i,
//
// Right now this imposes the same limit as MessageFormat in C++
// Namely, only MAX_ARGS arguments are supported
CAPI int32_t
U_CAPI int32_t
u_formatMessage( const char *locale,
const UChar *pattern,
int32_t patternLength,
@ -251,7 +251,7 @@ u_formatMessage( const char *locale,
UErrorCode *status,
...)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t patLen = (patternLength == -1 ? u_strlen(pattern) : patternLength);
int32_t actLen;
@ -413,7 +413,7 @@ u_formatMessage( const char *locale,
// 1. Call through to the C++ APIs
// 2. Just assume the user passed in enough arguments.
// 3. Iterate through each formattable returned, and assign to the arguments
CAPI void
U_CAPI void
u_parseMessage( const char *locale,
const UChar *pattern,
int32_t patternLength,
@ -422,7 +422,7 @@ u_parseMessage( const char *locale,
UErrorCode *status,
...)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
int32_t patLen = (patternLength == -1 ? u_strlen(pattern) : patternLength);
int32_t srcLen = (sourceLength == -1 ? u_strlen(source) : sourceLength);

4
icu4c/source/i18n/umsg.h
View file

@ -173,7 +173,7 @@
* output was truncated.
* @see u_parseMessage
*/
CAPI int32_t
U_CAPI int32_t
u_formatMessage( const char *locale,
const UChar *pattern,
int32_t patternLength,
@ -197,7 +197,7 @@ u_formatMessage( const char *locale,
* specified in pattern.
* @see u_formatMessage
*/
CAPI void
U_CAPI void
u_parseMessage( const char *locale,
const UChar *pattern,
int32_t patternLength,

60
icu4c/source/i18n/unum.cpp
View file

@ -26,12 +26,12 @@
#include "fmtable.h"
#include "dcfmtsym.h"
CAPI UNumberFormat*
U_CAPI UNumberFormat*
unum_open( UNumberFormatStyle style,
const char* locale,
UErrorCode* status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
UNumberFormat *retVal = 0;
switch(style) {
@ -75,13 +75,13 @@ unum_open( UNumberFormatStyle style,
return retVal;
}
CAPI UNumberFormat*
U_CAPI UNumberFormat*
unum_openPattern( const UChar* pattern,
int32_t patternLength,
const char* locale,
UErrorCode* status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
int32_t len = (patternLength == -1 ? u_strlen(pattern) : patternLength);
const UnicodeString pat((UChar*)pattern, len, len);
@ -109,17 +109,17 @@ unum_openPattern( const UChar* pattern,
return (UNumberFormat*) fmt;
}
CAPI void
U_CAPI void
unum_close(UNumberFormat* fmt)
{
delete (NumberFormat*) fmt;
}
CAPI UNumberFormat*
U_CAPI UNumberFormat*
unum_clone(const UNumberFormat *fmt,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
Format *res = ((DecimalFormat*)fmt)->clone();
@ -131,7 +131,7 @@ unum_clone(const UNumberFormat *fmt,
return (UNumberFormat*) res;
}
CAPI int32_t
U_CAPI int32_t
unum_format( const UNumberFormat* fmt,
int32_t number,
UChar* result,
@ -139,7 +139,7 @@ unum_format( const UNumberFormat* fmt,
UFieldPosition *pos,
UErrorCode* status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t actSize;
@ -160,7 +160,7 @@ unum_format( const UNumberFormat* fmt,
return actSize;
}
CAPI int32_t
U_CAPI int32_t
unum_formatDouble( const UNumberFormat* fmt,
double number,
UChar* result,
@ -168,7 +168,7 @@ unum_formatDouble( const UNumberFormat* fmt,
UFieldPosition *pos, /* 0 if ignore */
UErrorCode* status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t actSize;
@ -189,14 +189,14 @@ unum_formatDouble( const UNumberFormat* fmt,
return actSize;
}
CAPI int32_t
U_CAPI int32_t
unum_parse( const UNumberFormat* fmt,
const UChar* text,
int32_t textLength,
int32_t *parsePos /* 0 = start */,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
int32_t len = (textLength == -1 ? u_strlen(text) : textLength);
const UnicodeString src((UChar*)text, len, len);
@ -223,14 +223,14 @@ unum_parse( const UNumberFormat* fmt,
: (int32_t) res.getDouble();
}
CAPI double
U_CAPI double
unum_parseDouble( const UNumberFormat* fmt,
const UChar* text,
int32_t textLength,
int32_t *parsePos /* 0 = start */,
UErrorCode *status)
{
if(FAILURE(*status)) return 0;
if(U_FAILURE(*status)) return 0;
int32_t len = (textLength == -1 ? u_strlen(text) : textLength);
const UnicodeString src((UChar*)text, len, len);
@ -257,19 +257,19 @@ unum_parseDouble( const UNumberFormat* fmt,
: (double) res.getLong();
}
CAPI const char*
U_CAPI const char*
unum_getAvailable(int32_t index)
{
return uloc_getAvailable(index);
}
CAPI int32_t
U_CAPI int32_t
unum_countAvailable()
{
return uloc_countAvailable();
}
CAPI int32_t
U_CAPI int32_t
unum_getAttribute(const UNumberFormat* fmt,
UNumberFormatAttribute attr)
{
@ -339,7 +339,7 @@ unum_getAttribute(const UNumberFormat* fmt,
}
}
CAPI void
U_CAPI void
unum_setAttribute( UNumberFormat* fmt,
UNumberFormatAttribute attr,
int32_t newValue)
@ -407,7 +407,7 @@ unum_setAttribute( UNumberFormat* fmt,
}
}
CAPI double
U_CAPI double
unum_getDoubleAttribute(const UNumberFormat* fmt,
UNumberFormatAttribute attr)
{
@ -422,7 +422,7 @@ unum_getDoubleAttribute(const UNumberFormat* fmt,
}
}
CAPI void
U_CAPI void
unum_setDoubleAttribute( UNumberFormat* fmt,
UNumberFormatAttribute attr,
double newValue)
@ -435,14 +435,14 @@ unum_setDoubleAttribute( UNumberFormat* fmt,
}
}
CAPI int32_t
U_CAPI int32_t
unum_getTextAttribute( const UNumberFormat* fmt,
UNumberFormatTextAttribute tag,
UChar* result,
int32_t resultLength,
UErrorCode* status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t actSize = 0;
@ -481,14 +481,14 @@ unum_getTextAttribute( const UNumberFormat* fmt,
return actSize;
}
CAPI void
U_CAPI void
unum_setTextAttribute( UNumberFormat* fmt,
UNumberFormatTextAttribute tag,
const UChar* newValue,
int32_t newValueLength,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
int32_t len = (newValueLength == -1 ? u_strlen(newValue) : newValueLength);
const UnicodeString val((UChar*)newValue, len, len);
@ -520,14 +520,14 @@ unum_setTextAttribute( UNumberFormat* fmt,
}
}
CAPI int32_t
U_CAPI int32_t
unum_toPattern( const UNumberFormat* fmt,
bool_t isPatternLocalized,
UChar* result,
int32_t resultLength,
UErrorCode* status)
{
if(FAILURE(*status)) return -1;
if(U_FAILURE(*status)) return -1;
int32_t actSize;
@ -542,7 +542,7 @@ unum_toPattern( const UNumberFormat* fmt,
return actSize;
}
CAPI void
U_CAPI void
unum_getSymbols(const UNumberFormat* fmt,
UNumberFormatSymbols *syms)
{
@ -586,12 +586,12 @@ unum_getSymbols(const UNumberFormat* fmt,
syms->naN[len > 0 ? len + 1 : 0] = 0x0000;
}
CAPI void
U_CAPI void
unum_setSymbols( UNumberFormat* fmt,
const UNumberFormatSymbols* symbolsToSet,
UErrorCode *status)
{
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
DecimalFormatSymbols *syms = new DecimalFormatSymbols(*status);
if(syms == 0) {

38
icu4c/source/i18n/unum.h
View file

@ -152,7 +152,7 @@ typedef enum UNumberFormatPadPosition UNumberFormatPadPosition;
* an error occurred.
* @see unum_openPattern
*/
CAPI UNumberFormat*
U_CAPI UNumberFormat*
unum_open(UNumberFormatStyle style,
const char* locale,
UErrorCode* status);
@ -169,7 +169,7 @@ unum_open(UNumberFormatStyle style,
* an error occurred.
* @see unum_open
*/
CAPI UNumberFormat*
U_CAPI UNumberFormat*
unum_openPattern( const UChar* pattern,
int32_t patternLength,
const char* locale,
@ -180,7 +180,7 @@ unum_openPattern( const UChar* pattern,
* Once closed, a UNumberFormat may no longer be used.
* @param fmt The formatter to close.
*/
CAPI void
U_CAPI void
unum_close(UNumberFormat* fmt);
/**
@ -190,7 +190,7 @@ unum_close(UNumberFormat* fmt);
* @param status A pointer to an UErrorCode to receive any errors.
* @return A pointer to a UNumberFormat identical to fmt.
*/
CAPI UNumberFormat*
U_CAPI UNumberFormat*
unum_clone(const UNumberFormat *fmt,
UErrorCode *status);
@ -208,7 +208,7 @@ unum_clone(const UNumberFormat *fmt,
* @see unum_parse
* @see unum_parseDouble
*/
CAPI int32_t
U_CAPI int32_t
unum_format( const UNumberFormat* fmt,
int32_t number,
UChar* result,
@ -230,7 +230,7 @@ unum_format( const UNumberFormat* fmt,
* @see unum_parse
* @see unum_parseDouble
*/
CAPI int32_t
U_CAPI int32_t
unum_formatDouble( const UNumberFormat* fmt,
double number,
UChar* result,
@ -252,7 +252,7 @@ unum_formatDouble( const UNumberFormat* fmt,
* @see unum_format
* @see unum_formatDouble
*/
CAPI int32_t
U_CAPI int32_t
unum_parse( const UNumberFormat* fmt,
const UChar* text,
int32_t textLength,
@ -273,7 +273,7 @@ unum_parse( const UNumberFormat* fmt,
* @see unum_format
* @see unum_formatDouble
*/
CAPI double
U_CAPI double
unum_parseDouble( const UNumberFormat* fmt,
const UChar* text,
int32_t textLength,
@ -288,7 +288,7 @@ unum_parseDouble( const UNumberFormat* fmt,
* @return A locale for which number formatting patterns are available, or 0 if none.
* @see unum_countAvailable
*/
CAPI const char*
U_CAPI const char*
unum_getAvailable(int32_t index);
/**
@ -298,7 +298,7 @@ unum_getAvailable(int32_t index);
* @return The number of locales for which number formatting patterns are available.
* @see unum_getAvailable
*/
CAPI int32_t
U_CAPI int32_t
unum_countAvailable(void);
/** The possible UNumberFormat numeric attributes */
@ -362,7 +362,7 @@ typedef enum {
* @see unum_getTextAttribute
* @see unum_setTextAttribute
*/
CAPI int32_t
U_CAPI int32_t
unum_getAttribute(const UNumberFormat* fmt,
UNumberFormatAttribute attr);
@ -381,7 +381,7 @@ unum_getAttribute(const UNumberFormat* fmt,
* @see unum_getTextAttribute
* @see unum_setTextAttribute
*/
CAPI void
U_CAPI void
unum_setAttribute( UNumberFormat* fmt,
UNumberFormatAttribute attr,
int32_t newValue);
@ -399,7 +399,7 @@ unum_setAttribute( UNumberFormat* fmt,
* @see unum_getTextAttribute
* @see unum_setTextAttribute
*/
CAPI double
U_CAPI double
unum_getDoubleAttribute(const UNumberFormat* fmt,
UNumberFormatAttribute attr);
@ -415,7 +415,7 @@ unum_getDoubleAttribute(const UNumberFormat* fmt,
* @see unum_getTextAttribute
* @see unum_setTextAttribute
*/
CAPI void
U_CAPI void
unum_setDoubleAttribute( UNumberFormat* fmt,
UNumberFormatAttribute attr,
double newValue);
@ -449,7 +449,7 @@ typedef enum UNumberFormatTextAttribute UNumberFormatTextAttribute;
* @see unum_getAttribute
* @see unum_setAttribute
*/
CAPI int32_t
U_CAPI int32_t
unum_getTextAttribute( const UNumberFormat* fmt,
UNumberFormatTextAttribute tag,
UChar* result,
@ -469,7 +469,7 @@ unum_getTextAttribute( const UNumberFormat* fmt,
* @see unum_getAttribute
* @see unum_setAttribute
*/
CAPI void
U_CAPI void
unum_setTextAttribute( UNumberFormat* fmt,
UNumberFormatTextAttribute tag,
const UChar* newValue,
@ -486,7 +486,7 @@ unum_setTextAttribute( UNumberFormat* fmt,
* @param status A pointer to an UErrorCode to receive any errors
* @return The total buffer size needed; if greater than resultLength, the output was truncated.
*/
CAPI int32_t
U_CAPI int32_t
unum_toPattern( const UNumberFormat* fmt,
bool_t isPatternLocalized,
UChar* result,
@ -541,7 +541,7 @@ typedef struct UNumberFormatSymbols UNumberFormatSymbols;
* @param syms A pointer to a UNumberFormatSymbols to receive the symbols associated with fmt.
* @see unum_setSymbols
*/
CAPI void
U_CAPI void
unum_getSymbols( const UNumberFormat *fmt,
UNumberFormatSymbols *syms);
@ -554,7 +554,7 @@ unum_getSymbols( const UNumberFormat *fmt,
* @param status A pointer to an UErrorCode to receive any errors.
* @see unum_getSymbols
*/
CAPI void
U_CAPI void
unum_setSymbols( UNumberFormat* fmt,
const UNumberFormatSymbols* symbolsToSet,
UErrorCode *status);

34
icu4c/source/samples/XMLConverter/XMLConverter.cpp
View file

@ -155,7 +155,7 @@ int main(int argc, char** argv)
}
conv = ucnv_open(encName, &err);
if (FAILURE(err))
if (U_FAILURE(err))
{
if (verbose)
{
@ -382,7 +382,7 @@ void convertFile(char* encName, char* iFN, char* oFN, UConverter* outConvrtr)
}
}
if ((err != U_BUFFER_OVERFLOW_ERROR) && FAILURE(err) )
if ((err != U_BUFFER_OVERFLOW_ERROR) && U_FAILURE(err) )
{
#if defined(_DEBUG)
fprintf (stderr, "Error transcoding rest of the file: (%s) %d\n", errorName(err), err);
@ -520,7 +520,7 @@ long convertFirstLine( FILE* inF, char* inEncName,
{
err = U_ZERO_ERROR;
}
else if (FAILURE(err))
else if (U_FAILURE(err))
{
#if defined(_DEBUG)
printf ("Error transcoding first line of input file: (%s) %d\n", errorName(err), err);
@ -538,7 +538,7 @@ long convertFirstLine( FILE* inF, char* inEncName,
bytesRead,
&err);
if (FAILURE(err))
if (U_FAILURE(err))
{
#if defined(_DEBUG)
printf ("Error transcoding2 first line of input file: (%s) %d\n", errorName(err), err);
@ -783,7 +783,7 @@ long convertFirstLine( FILE* inF, char* inEncName,
{
err = U_ZERO_ERROR;
}
else if (FAILURE(err))
else if (U_FAILURE(err))
{
#if defined(_DEBUG)
fprintf (stderr, "Error transcoding char-by-char: (%s) %d\n", errorName(err), err);
@ -800,7 +800,7 @@ long convertFirstLine( FILE* inF, char* inEncName,
(const char*) stringTwo,
1,
&err);
if (FAILURE(err))
if (U_FAILURE(err))
{
#if defined(_DEBUG)
fprintf (stderr, "Error transcoding2 char-by-char: (%s) %d\n", errorName(err), err);
@ -856,7 +856,7 @@ long convertFirstLine( FILE* inF, char* inEncName,
{
err = U_ZERO_ERROR;
}
else if (FAILURE(err))
else if (U_FAILURE(err))
{
#if defined(_DEBUG)
fprintf (stderr, "Error transcoding from ascii to input encoding: (%s) %d\n", errorName(err), err);
@ -872,7 +872,7 @@ long convertFirstLine( FILE* inF, char* inEncName,
(const char*) oldBuf,
bufHere,
&err);
if (FAILURE(err))
if (U_FAILURE(err))
{
#if defined(_DEBUG)
fprintf (stderr, "Error transcoding2 from ascii to input encoding: (%s) %d\n", errorName(err), err);
@ -902,7 +902,7 @@ int32_t XMLUConvert( UConverter* inConverter,
const char* outBufferEnd = outBuffer + outBufCapacity;
//const char* consumed;
if (FAILURE(*err)) return 0;
if (U_FAILURE(*err)) return 0;
XMLU_fromCodepageToCodepage(outConverter,
inConverter,
@ -939,7 +939,7 @@ void XMLU_fromCodepageToCodepage( UConverter* outConverter,
UChar const* consumed_UChars;
if (FAILURE(*err)) return;
if (U_FAILURE(*err)) return;
*consumed = *source;
/*loops until the input buffer is completely consumed
@ -948,7 +948,7 @@ void XMLU_fromCodepageToCodepage( UConverter* outConverter,
*then from Unicode to outConverter codepage
*/
while ((sourceLimit != *source) && SUCCESS(*err))
while ((sourceLimit != *source) && U_SUCCESS(*err))
{
out_chunk_alias = out_chunk;
*source = *consumed;
@ -966,12 +966,12 @@ void XMLU_fromCodepageToCodepage( UConverter* outConverter,
*we will require at least another loop (it's a recoverable error)
*/
if (SUCCESS(*err) || (*err == U_INDEX_OUTOFBOUNDS_ERROR))
if (U_SUCCESS(*err) || (*err == U_INDEX_OUTOFBOUNDS_ERROR))
{
*err = U_ZERO_ERROR;
out_chunk_alias2 = out_chunk;
while ((out_chunk_alias2 != out_chunk_alias) && SUCCESS(*err))
while ((out_chunk_alias2 != out_chunk_alias) && U_SUCCESS(*err))
{
ucnv_fromUnicode(outConverter,
target,
@ -997,7 +997,7 @@ void XMLU_fromCodepageToCodepage( UConverter* outConverter,
UChar const *out_chunk_alias2;
if (FAILURE (*err)) return;
if (U_FAILURE (*err)) return;
/*loops until the input buffer is completely consumed
@ -1005,7 +1005,7 @@ void XMLU_fromCodepageToCodepage( UConverter* outConverter,
*first we convert from inConverter codepage to Unicode
*then from Unicode to outConverter codepage
*/
while ((*source != sourceLimit) && SUCCESS (*err))
while ((*source != sourceLimit) && U_SUCCESS (*err))
{
out_chunk_alias = out_chunk;
ucnv_toUnicode (inConverter,
@ -1021,12 +1021,12 @@ void XMLU_fromCodepageToCodepage( UConverter* outConverter,
*we will require at least another loop (it's a recoverable error)
*/
if (SUCCESS (*err) || (*err == U_INDEX_OUTOFBOUNDS_ERROR))
if (U_SUCCESS (*err) || (*err == U_INDEX_OUTOFBOUNDS_ERROR))
{
*err = U_ZERO_ERROR;
out_chunk_alias2 = out_chunk;
while ((out_chunk_alias2 != out_chunk_alias) && SUCCESS (*err))
while ((out_chunk_alias2 != out_chunk_alias) && U_SUCCESS (*err))
{
ucnv_fromUnicode (outConverter,
target,

14
icu4c/source/samples/cal/cal.c
View file

@ -158,7 +158,7 @@ main(int argc,
/* print the cal */
cal(month, year, useLongNames, &status);
return (FAILURE(status) ? 1 : 0);
return (U_FAILURE(status) ? 1 : 0);
}
/* Usage information */
@ -202,7 +202,7 @@ cal(int32_t month,
const UChar *months [MONTH_COUNT];
int32_t fdow;
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
/* Create a new calendar */
c = ucal_open(0, -1, uloc_getDefault(), UCAL_TRADITIONAL, status);
@ -265,7 +265,7 @@ get_days(const UChar *days [],
int32_t i, count;
const char *key = (useLongNames ? "DayNames" : "DayAbbreviations");
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
/* fdow is 1-based */
--fdow;
@ -292,7 +292,7 @@ get_months(const UChar *months [],
int32_t i, count;
const char *key = (useLongNames ? "MonthNames" : "MonthAbbreviations");
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
bundle = ures_open(0, 0, status);
count = ures_countArrayItems(bundle, key, status);
@ -331,7 +331,7 @@ print_days(const UChar *days [],
{
int32_t i;
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
/* Print the day names */
for(i = 0; i < DAY_COUNT; ++i) {
@ -357,7 +357,7 @@ print_month(UCalendar *c,
const UChar *pat = (useLongNames ? sLongPat : sShortPat);
int32_t len = (useLongNames ? 9 : 8);
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
/* ========== Generate the header containing the month and year */
@ -470,7 +470,7 @@ print_year(UCalendar *c,
int32_t left_firstday, right_firstday, left_current, right_current;
int32_t left_month, right_month;
if(FAILURE(*status)) return;
if(U_FAILURE(*status)) return;
/* Alias */
left_cal = c;

2
icu4c/source/samples/cal/uprint.c
View file

@ -51,7 +51,7 @@ uprint(const UChar *s,
converter = ucnv_open(0, status);
/* if we failed, clean up and exit */
if(FAILURE(*status)) goto finish;
if(U_FAILURE(*status)) goto finish;
/* perform the conversion */
do {

4
icu4c/source/samples/date/date.c
View file

@ -122,7 +122,7 @@ main(int argc,
/* print the date */
date(tz, style, &status);
return (FAILURE(status) ? 1 : 0);
return (U_FAILURE(status) ? 1 : 0);
}
/* Usage information */
@ -169,7 +169,7 @@ date(const UChar *tz,
s = (UChar*) malloc(sizeof(UChar) * (len+1));
if(s == 0) goto finish;
udat_format(fmt, ucal_getNow(), s, len + 1, 0, status);
if(FAILURE(*status)) goto finish;
if(U_FAILURE(*status)) goto finish;
}
/* print the date string */

2
icu4c/source/samples/date/uprint.c
View file

@ -53,7 +53,7 @@ uprint(const UChar *s,
converter = ucnv_open(0, status);
/* if we failed, clean up and exit */
if(FAILURE(*status)) goto finish;
if(U_FAILURE(*status)) goto finish;
/* perform the conversion */
do {

12
icu4c/source/test/cintltst/callcoll.c
View file

@ -15,7 +15,7 @@
*
* Modification History:
* Name Description
* Madhu Katragadda Ported for CAPI
* Madhu Katragadda Ported for C API
*********************************************************************************
*/
/**
@ -431,7 +431,7 @@ void TestTertiary()
u_strcpy(rules, DEFAULTRULEARRAY);
u_strcat(rules, newRules);
myCollation=ucol_openRules(rules, u_strlen(rules), UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in creation of rule based collator :%s\n", myErrorName(status));
}
@ -462,7 +462,7 @@ void TestPrimary( )
u_strcpy(rules, DEFAULTRULEARRAY);
u_strcat(rules, newRules);
myCollation=ucol_openRules(rules, u_strlen(rules), UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in creation of rule based collator :%s\n", myErrorName(status));
}
ucol_setNormalization(myCollation, UCOL_DEFAULT_NORMALIZATION);
@ -496,7 +496,7 @@ void TestSecondary()
u_strcat(rules, newRules);
myCollation=ucol_openRules(rules, u_strlen(rules), UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in creation of rule based collator :%s\n", myErrorName(status));
}
ucol_setStrength(myCollation, UCOL_SECONDARY);
@ -526,7 +526,7 @@ void TestIdentical()
u_strcat(rules, newRules);
myCollation=ucol_openRules(rules, u_strlen(rules), UCOL_NO_NORMALIZATION, UCOL_IDENTICAL, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in creation of rule based collator :%s\n", myErrorName(status));
}
for(i= 34; i<37; i++)
@ -555,7 +555,7 @@ void TestExtra()
myCollation=ucol_openRules(rules, u_strlen(rules), UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in creation of rule based collator :%s\n", myErrorName(status));
}
ucol_setNormalization(myCollation, UCOL_DEFAULT_NORMALIZATION);

40
icu4c/source/test/cintltst/capitst.c
View file

@ -15,7 +15,7 @@
*
* Modification History:
* Name Description
* Madhu Katragadda Ported for CAPI
* Madhu Katragadda Ported for C API
*********************************************************************************
*//* C API TEST For COLLATOR */
#include "utypes.h"
@ -61,7 +61,7 @@ void TestProperty()
log_verbose("The property tests begin : \n");
log_verbose("Test ucol_strcoll : \n");
col = ucol_open(NULL, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("Default Collator creation failed.: %s\n", myErrorName(status));
return;
}
@ -120,7 +120,7 @@ void TestProperty()
disName=(UChar*)malloc(sizeof(UChar) * (len+1));
ucol_getDisplayName("en_US", "de_DE", disName, len+1, &status);
}
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in getDisplayName: %s\n", myErrorName(status));
return;
}
@ -137,7 +137,7 @@ void TestProperty()
log_verbose("open an collator for french locale");
col = ucol_open("fr_FR", &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ERROR: Creating French collation failed.: %s\n", myErrorName(status));
return;
}
@ -160,7 +160,7 @@ void TestProperty()
disName=(UChar*)malloc(sizeof(UChar) * (len+1));
ucol_getDisplayName("fr_FR", "en_US", disName, len+1, &status);
}
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in getDisplayName: %s\n", myErrorName(status));
return;
}
@ -186,7 +186,7 @@ void TestRuleBasedColl()
u_uastrcpy(ruleset2, "< a, A < b, B < c, C < d, D, e, E");
col1 = ucol_openRules(ruleset1, u_strlen(ruleset1), UCOL_DEFAULT_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("RuleBased Collator creation failed.: %s\n", myErrorName(status));
return;
}
@ -195,7 +195,7 @@ void TestRuleBasedColl()
status = U_ZERO_ERROR;
col2 = ucol_openRules(ruleset2, u_strlen(ruleset2), UCOL_DEFAULT_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("RuleBased Collator creation failed.: %s\n", myErrorName(status));
return;
}
@ -205,7 +205,7 @@ void TestRuleBasedColl()
status = U_ZERO_ERROR;
col3= ucol_open(NULL, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("Default Collator creation failed.: %s\n", myErrorName(status));
return;
}
@ -221,7 +221,7 @@ void TestRuleBasedColl()
doAssert((u_strcmp(rule1, rule3) != 0), "Default collator getRules failed");
col4=ucol_openRules(rule2, u_strlen(rule2), UCOL_DEFAULT_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("RuleBased Collator creation failed.: %s\n", myErrorName(status));
return;
}
@ -245,7 +245,7 @@ void TestCompare()
log_verbose("The compare tests begin : \n");
status=U_ZERO_ERROR;
col = ucol_open("en_US", &status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
log_err("ucal_open() collation creation failed.: %s\n", myErrorName(status));
return;
}
@ -294,7 +294,7 @@ void TestSortKey()
UErrorCode status = U_ZERO_ERROR;
log_verbose("testing SortKey begins...\n");
col = ucol_open(NULL, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ERROR: Default collation creation failed.: %s\n", myErrorName(status));
return;
}
@ -356,7 +356,7 @@ void TestHashCode()
UErrorCode status = U_ZERO_ERROR;
log_verbose("testing getHashCode begins...\n");
col = ucol_open("en_US", &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ERROR: Default collation creation failed.: %s\n", myErrorName(status));
return;
}
@ -408,7 +408,7 @@ void TestElemIter()
log_verbose("testing UCollatorElements begins...\n");
col = ucol_open(NULL, &status);
ucol_setNormalization(col, UCOL_NO_NORMALIZATION);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ERROR: Default collation creation failed.: %s\n", myErrorName(status));
return;
}
@ -421,7 +421,7 @@ void TestElemIter()
log_verbose("Constructors and comparison testing....\n");
iterator1 = ucol_openElements(col, testString1, u_strlen(testString1), &status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
log_err("ERROR: Default collationElement iterator creation failed.: %s\n", myErrorName(status));
ucol_close(col);
return;
@ -429,7 +429,7 @@ void TestElemIter()
else{ log_verbose("PASS: Default collationElement iterator1 creation passed\n");}
iterator2 = ucol_openElements(col, testString1, u_strlen(testString1), &status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
log_err("ERROR: Default collationElement iterator creation failed.: %s\n", myErrorName(status));
ucol_close(col);
return;
@ -437,7 +437,7 @@ void TestElemIter()
else{ log_verbose("PASS: Default collationElement iterator2 creation passed\n");}
iterator3 = ucol_openElements(col, testString2, u_strlen(testString2), &status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
log_err("ERROR: Default collationElement iterator creation failed.: %s\n", myErrorName(status));
ucol_close(col);
return;
@ -446,7 +446,7 @@ void TestElemIter()
offset=ucol_getOffset(iterator1);
ucol_setOffset(iterator1, 6, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("Error in setOffset for UCollatorElements iterator.: %s\n", myErrorName(status));
return;
}
@ -458,19 +458,19 @@ void TestElemIter()
ucol_setOffset(iterator1, 0, &status);
order1 = ucol_next(iterator1, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("Somehow ran out of memory stepping through the iterator1.: %s\n", myErrorName(status));
return;
}
order2=ucol_getOffset(iterator2);
doAssert((order1 != order2), "The first iterator advance failed");
order2 = ucol_next(iterator2, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("Somehow ran out of memory stepping through the iterator2.: %s\n", myErrorName(status));
return;
}
order3 = ucol_next(iterator3, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("Somehow ran out of memory stepping through the iterator3.: %s\n", myErrorName(status));
return;
}

10
icu4c/source/test/cintltst/cbiapts.c
View file

@ -54,7 +54,7 @@ void TestBreakIteratorCAPI()
/* Use french for fun */
word = ubrk_open(UBRK_WORD, "en_US", text, u_strlen(text), &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: Error in ubrk_open() for word breakiterator: %s\n", myErrorName(status));
}
else{
@ -62,7 +62,7 @@ void TestBreakIteratorCAPI()
}
sentence = ubrk_open(UBRK_SENTENCE, "en_US", text, u_strlen(text), &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: Error in ubrk_open() for sentence breakiterator: %s\n", myErrorName(status));
}
else{
@ -70,7 +70,7 @@ void TestBreakIteratorCAPI()
}
line = ubrk_open(UBRK_SENTENCE, "en_US", text, u_strlen(text), &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: Error in ubrk_open() for line breakiterator: %s\n", myErrorName(status));
}
else{
@ -78,7 +78,7 @@ void TestBreakIteratorCAPI()
}
character = ubrk_open(UBRK_SENTENCE, "en_US", text, u_strlen(text), &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: Error in ubrk_open() for character breakiterator: %s\n", myErrorName(status));
}
else{
@ -178,7 +178,7 @@ void TestBreakIteratorCAPI()
/*Testing ubrk_open and ubrk_close()*/
log_verbose("\nTesting open and close for us locale\n");
b = ubrk_open(UBRK_WORD, "fr_FR", text, u_strlen(text), &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ubrk_open for word returned NULL: %s\n", myErrorName(status));
}
ubrk_close(b);

20
icu4c/source/test/cintltst/cbiditst.c
View file

@ -92,7 +92,7 @@ doTests(UBiDi *pBiDi, UBiDi *pLine) {
s=getStringFromDirProps(tests[i].text, tests[i].length);
paraLevel=tests[i].paraLevel;
ubidi_setPara(pBiDi, s, -1, paraLevel, NULL, &errorCode);
if(SUCCESS(errorCode)) {
if(U_SUCCESS(errorCode)) {
log_verbose("ubidi_setPara(tests[%d], paraLevel %d) ok, direction %d paraLevel=%d\n",
i, paraLevel, ubidi_getDirection(pBiDi), ubidi_getParaLevel(pBiDi));
lineStart=tests[i].lineStart;
@ -100,7 +100,7 @@ doTests(UBiDi *pBiDi, UBiDi *pLine) {
doTest(pBiDi, i, tests+i, 0);
} else {
ubidi_setLine(pBiDi, lineStart, tests[i].lineLimit, pLine, &errorCode);
if(SUCCESS(errorCode)) {
if(U_SUCCESS(errorCode)) {
log_verbose("ubidi_setLine(%d, %d) ok, direction %d paraLevel=%d\n",
lineStart, tests[i].lineLimit, ubidi_getDirection(pLine), ubidi_getParaLevel(pLine));
doTest(pLine, i, tests+i, lineStart);
@ -168,7 +168,7 @@ doTest(UBiDi *pBiDi, int testNumber, BiDiTestData *test, UTextOffset lineStart)
for(i=0; i<len; ++i) {
logicalIndex=ubidi_getVisualIndex(pBiDi, i, &errorCode);
if(FAILURE(errorCode)) {
if(U_FAILURE(errorCode)) {
log_err("ubidi_getVisualIndex(tests[%d], %d): error %s\n", testNumber, i, myErrorName(errorCode));
return;
}
@ -179,7 +179,7 @@ doTest(UBiDi *pBiDi, int testNumber, BiDiTestData *test, UTextOffset lineStart)
}
runCount=ubidi_countRuns(pBiDi, &errorCode);
if(FAILURE(errorCode)) {
if(U_FAILURE(errorCode)) {
log_err("ubidi_countRuns(tests[%d]): error %s\n", testNumber, myErrorName(errorCode));
return;
}
@ -221,14 +221,14 @@ testReordering(UBiDi *pBiDi, int testNumber) {
/* get the logical and visual maps from the object */
ubidi_getLogicalMap(pBiDi, logicalMap1, &errorCode);
if(FAILURE(errorCode)) {
if(U_FAILURE(errorCode)) {
log_err("ubidi_getLogicalMap(tests[%d]): error %s\n", testNumber, myErrorName(errorCode));
return;
}
ubidi_getVisualMap(pBiDi, visualMap1, &errorCode);
if(FAILURE(errorCode)) {
if(U_FAILURE(errorCode)) {
log_err("ubidi_getVisualMap(tests[%d]): error %s\n", testNumber, myErrorName(errorCode));
return;
}
@ -239,7 +239,7 @@ testReordering(UBiDi *pBiDi, int testNumber) {
/* get them from the levels array, too */
icu_memcpy(levels, ubidi_getLevels(pBiDi, &errorCode), length);
if(FAILURE(errorCode)) {
if(U_FAILURE(errorCode)) {
log_err("ubidi_getLevels(tests[%d]): error %s\n", testNumber, myErrorName(errorCode));
return;
}
@ -249,7 +249,7 @@ testReordering(UBiDi *pBiDi, int testNumber) {
/* get the visual map from the runs, too */
runCount=ubidi_countRuns(pBiDi, &errorCode);
if(FAILURE(errorCode)) {
if(U_FAILURE(errorCode)) {
log_err("ubidi_countRuns(tests[%d]): error %s\n", testNumber, myErrorName(errorCode));
return;
}
@ -335,7 +335,7 @@ testReordering(UBiDi *pBiDi, int testNumber) {
log_verbose("bidi reordering error in tests[%d]: logicalMap1[i]!=ubidi_getVisualIndex(i) at i=%d\n", testNumber, i);
break;
}
if(FAILURE(errorCode)) {
if(U_FAILURE(errorCode)) {
log_verbose("ubidi_getVisualIndex(tests[%d], %d): error %s\n", testNumber, i, myErrorName(errorCode));
break;
}
@ -343,7 +343,7 @@ testReordering(UBiDi *pBiDi, int testNumber) {
log_verbose("bidi reordering error in tests[%d]: visualMap1[i]!=ubidi_getLogicalIndex(i) at i=%d\n", testNumber, i);
break;
}
if(FAILURE(errorCode)) {
if(U_FAILURE(errorCode)) {
log_verbose("ubidi_getLogicalIndex(tests[%d], %d): error %s\n", testNumber, i, myErrorName(errorCode));
break;
}

126
icu4c/source/test/cintltst/ccaltst.c
View file

@ -70,7 +70,7 @@ void TestCalendar()
log_verbose("\nTesting getAvialableTimezoneids");
for(i=0;i<count;i++){
ucal_getAvailableTZIDs(offset, i, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: There is an error in the getAvialableTZIDs the error is %s\n", myErrorName(status));
}
log_verbose("%s\n", austrdup(ucal_getAvailableTZIDs(offset, i, &status)));
@ -83,21 +83,21 @@ void TestCalendar()
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "PST");
caldef=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: error in ucal_open caldef : %s\n", myErrorName(status));
}
caldef2=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: error in ucal_open caldef : %s\n", myErrorName(status));
}
u_uastrcpy(tzID, "GMT");
calfr=ucal_open(tzID, u_strlen(tzID), "fr_FR", UCAL_TRADITIONAL, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: error in ucal_open calfr : %s\n", myErrorName(status));
}
calit=ucal_open(tzID, u_strlen(tzID), "it_IT", UCAL_TRADITIONAL, &status);
if(FAILURE(status)) {
if(U_FAILURE(status)) {
log_err("FAIL: error in ucal_open calit : %s\n", myErrorName(status));
}
@ -131,7 +131,7 @@ void TestCalendar()
now=ucal_getNow();
/* open the date format and format the date to check the output */
datdef=udat_open(UDAT_FULL,UDAT_FULL ,NULL, NULL, 0,&status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("FAIL: error in creating the dateformat : %s\n", myErrorName(status));
}
log_verbose("PASS: The current date and time fetched is %s\n", austrdup(myDateFormat(datdef, now)) );
@ -150,7 +150,7 @@ void TestCalendar()
result=(UChar*)malloc(sizeof(UChar) * resultlength);
ucal_getTimeZoneDisplayName(caldef, UCAL_DST, "en_US", result, resultlength, &status);
}
if(FAILURE(status)) {
if(U_FAILURE(status)) {
log_err("FAIL: Error in getting the timezone display name : %s\n", myErrorName(status));
}
else{
@ -210,7 +210,7 @@ void TestCalendar()
log_verbose("\nTesting if the UCalendar is currently in daylight saving's time\n");
ucal_setDateTime(caldef, 1999, UCAL_MARCH, 3, 10, 45, 20, &status);
ucal_inDaylightTime(caldef, &status );
if(FAILURE(status)) {
if(U_FAILURE(status)) {
log_err("Error in ucal_inDaylightTime: %s\n", myErrorName(status));
}
if(!ucal_inDaylightTime(caldef, &status))
@ -258,7 +258,7 @@ void TestGetSetDateAPI()
caldef2=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
/*open the dateformat */
datdef=udat_open(UDAT_DEFAULT,UDAT_DEFAULT ,NULL,fgGMTID,-1, &status);
if(FAILURE(status))
if(U_FAILURE(status))
{
log_err("error in creating the dateformat : %s\n", myErrorName(status));
}
@ -267,14 +267,14 @@ void TestGetSetDateAPI()
/*Testing getMillis and setMillis */
log_verbose("\nTesting the date and time fetched in millis for a calendar using getMillis\n");
d1=ucal_getMillis(caldef, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("Error in getMillis : %s\n", myErrorName(status));
}
/*testing setMillis */
log_verbose("\nTesting the set date and time function using setMillis\n");
ucal_setMillis(caldef, d2, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("Error in setMillis : %s\n", myErrorName(status));
}
@ -290,14 +290,14 @@ void TestGetSetDateAPI()
/*testing ucal_setTimeZone() function*/
log_verbose("\nTesting if the function ucal_setTimeZone() works fine\n");
ucal_setMillis(caldef2, d2, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("Error in getMillis : %s\n", myErrorName(status));;
}
hour=ucal_get(caldef2, UCAL_HOUR_OF_DAY, &status);
u_uastrcpy(tzID, "PST");
ucal_setTimeZone(caldef2,tzID, 3, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("Error in setting the time zone using ucal_setTimeZone(): %s\n", myErrorName(status));
}
else
@ -313,7 +313,7 @@ void TestGetSetDateAPI()
log_verbose("\nTesting setTimeZone() roundtrip\n");
u_uastrcpy(tzID, "GMT");
ucal_setTimeZone(caldef2, tzID, 3, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("Error in setting the time zone using ucal_setTimeZone(): %s\n", myErrorName(status));
}
if(d2==ucal_getMillis(caldef2, &status))
@ -328,7 +328,7 @@ void TestGetSetDateAPI()
log_verbose("\nTesting the ucal_setDate() function \n");
u_uastrcpy(temp, "Dec 17, 1971 11:05:28 PM");
ucal_setDate(caldef,1971, UCAL_DECEMBER, 17, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("error in setting the calendar date : %s\n", myErrorName(status));
}
/*checking if the calendar date is set properly or not */
@ -359,7 +359,7 @@ void TestGetSetDateAPI()
log_verbose("\nTesting the ucal_setDateTime() function \n");
u_uastrcpy(temp, "May 3, 1972 4:30:42 PM");
ucal_setDateTime(caldef,1972, UCAL_MAY, 3, 16, 30, 42, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("error in setting the calendar date : %s\n", myErrorName(status));
}
/*checking if the calendar date is set properly or not */
@ -411,12 +411,12 @@ void TestFieldGetSet()
u_uastrcpy(tzID, "GMT");
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_open failed: %s\n", myErrorName(status));
return;
}
datdef=udat_open(UDAT_SHORT,UDAT_SHORT ,NULL,fgGMTID,-1, &status);
if(FAILURE(status))
if(U_FAILURE(status))
{
log_err("error in creating the dateformat : %s\n", myErrorName(status));
}
@ -424,7 +424,7 @@ void TestFieldGetSet()
/*Testing ucal_get()*/
log_verbose("\nTesting the ucal_get() function of Calendar\n");
ucal_setDateTime(cal, 1999, UCAL_MARCH, 12, 5, 25, 30, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("error in the setDateTime() : %s\n", myErrorName(status));
}
if(ucal_get(cal, UCAL_YEAR, &status)!=1999 || ucal_get(cal, UCAL_MONTH, &status)!=2 ||
@ -560,7 +560,7 @@ void TestAddRollExtensive()
u_uastrcpy(tzID, "PST");
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);;
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_open() failed : %s\n", myErrorName(status));
return;
}
@ -573,23 +573,23 @@ void TestAddRollExtensive()
log_verbose("\nTesting to confirm that adding to various fields works with ucal_add()\n");
checkDate(cal, y, m, d);
ucal_add(cal,UCAL_YEAR, 1, &status);
if (FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status)); return; }
if (U_FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status)); return; }
y++;
checkDate(cal, y, m, d);
ucal_add(cal,UCAL_MONTH, 12, &status);
if (FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status) ); return; }
y+=1;
checkDate(cal, y, m, d);
ucal_add(cal,UCAL_DATE, 1, &status);
if (FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status) ); return; }
d++;
checkDate(cal, y, m, d);
ucal_add(cal,UCAL_DATE, 2, &status);
if (FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status) ); return; }
d += 2;
checkDate(cal, y, m, d);
ucal_add(cal,UCAL_DATE, 28, &status);
if (FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_add failed: %s\n", myErrorName(status) ); return; }
++m;
checkDate(cal, y, m, d);
ucal_add(cal, -1, 10, &status);
@ -604,26 +604,26 @@ void TestAddRollExtensive()
/*confirm that applying roll to various fields works fine*/
log_verbose("\nTesting to confirm that ucal_roll() works\n");
ucal_roll(cal, UCAL_DATE, -1, &status);
if (FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
d -=1;
checkDate(cal, y, m, d);
ucal_roll(cal, UCAL_MONTH, -2, &status);
if (FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
m -=2;
checkDate(cal, y, m, d);
ucal_roll(cal, UCAL_DATE, 1, &status);
if (FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
d +=1;
checkDate(cal, y, m, d);
ucal_roll(cal, UCAL_MONTH, -12, &status);
if (FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
checkDate(cal, y, m, d);
ucal_roll(cal, UCAL_YEAR, -1, &status);
if (FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
y -=1;
checkDate(cal, y, m, d);
ucal_roll(cal, UCAL_DATE, 29, &status);
if (FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_roll failed: %s\n", myErrorName(status) ); return; }
d = 2;
checkDate(cal, y, m, d);
ucal_roll(cal, -1, 10, &status);
@ -635,7 +635,7 @@ void TestAddRollExtensive()
}
status=U_ZERO_ERROR;
ucal_setDateTime(cal, 1999, UCAL_FEBRUARY, 28, 10, 30, 45, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("error is setting the datetime: %s\n", myErrorName(status));
}
ucal_add(cal, UCAL_MONTH, 1, &status);
@ -650,7 +650,7 @@ void TestAddRollExtensive()
log_verbose("\nTesting the ucal_add() and ucal_roll() functions extensively\n");
y = 1997; m = UCAL_FEBRUARY; d = 1; hr = 1; min = 1; sec = 0; ms = 0;
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_open failed: %s\n", myErrorName(status));
return;
}
@ -669,11 +669,11 @@ void TestAddRollExtensive()
status = U_ZERO_ERROR;
for (i = 0; i < limit; i++) {
ucal_add(cal, e, 1, &status);
if (FAILURE(status)) { limit = i; status = U_ZERO_ERROR; }
if (U_FAILURE(status)) { limit = i; status = U_ZERO_ERROR; }
}
for (i = 0; i < limit; i++) {
ucal_add(cal, e, -1, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_add -1 failed: %s\n", myErrorName(status));
return;
}
@ -686,11 +686,11 @@ void TestAddRollExtensive()
status = U_ZERO_ERROR;
for (i = 0; i < limit; i++) {
ucal_roll(cal, e, 1, &status);
if (FAILURE(status)) { limit = i; status = U_ZERO_ERROR; }
if (U_FAILURE(status)) { limit = i; status = U_ZERO_ERROR; }
}
for (i = 0; i < limit; i++) {
ucal_roll(cal, e, -1, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_roll -1 failed: %s\n", myErrorName(status));
return;
}
@ -716,7 +716,7 @@ void TestGetLimits()
u_uastrcpy(tzID, "PST");
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);;
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_open() for gregorian calendar failed in TestGetLimits: %s\n", myErrorName(status));
return;
}
@ -755,7 +755,7 @@ void TestGetLimits()
le_max=ucal_getLimit(cal, UCAL_MONTH, UCAL_LEAST_MAXIMUM, &status);
ac_min=ucal_getLimit(cal, UCAL_MONTH, UCAL_ACTUAL_MINIMUM, &status);
ac_max=ucal_getLimit(cal, UCAL_MONTH, UCAL_ACTUAL_MAXIMUM, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("Error in getLimits: %s\n", myErrorName(status));
}
if(min!=0 || max!=11 || gr_min!=0 || le_max!=11 || ac_min!=0 || ac_max!=11)
@ -808,13 +808,13 @@ void TestDOWProgression()
u_uastrcpy(tzID, "GMT");
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);;
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_open failed: %s\n", myErrorName(status));
return;
}
datfor=udat_open(UDAT_MEDIUM,UDAT_MEDIUM ,NULL, fgGMTID,-1, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("error in creating the dateformat : %s\n", myErrorName(status));
}
@ -824,23 +824,23 @@ void TestDOWProgression()
log_verbose("\nTesting the DOW progression\n");
initialDOW = ucal_get(cal, UCAL_DAY_OF_WEEK, &status);
if (FAILURE(status)) { log_err("ucal_get() failed: %s\n", myErrorName(status) ); return; }
if (U_FAILURE(status)) { log_err("ucal_get() failed: %s\n", myErrorName(status) ); return; }
newDOW = initialDOW;
do {
DOW = newDOW;
log_verbose("DOW = %d...\n", DOW);
date1=ucal_getMillis(cal, &status);
if(FAILURE(status)){ log_err("ucal_getMiilis() failed: %s\n", myErrorName(status)); return;}
if(U_FAILURE(status)){ log_err("ucal_getMiilis() failed: %s\n", myErrorName(status)); return;}
log_verbose("%s\n", austrdup(myDateFormat(datfor, date1)));
ucal_add(cal,UCAL_DAY_OF_WEEK, delta, &status);
if (FAILURE(status)) { log_err("ucal_add() failed: %s\n", myErrorName(status)); return; }
if (U_FAILURE(status)) { log_err("ucal_add() failed: %s\n", myErrorName(status)); return; }
newDOW = ucal_get(cal, UCAL_DAY_OF_WEEK, &status);
if (FAILURE(status)) { log_err("ucal_get() failed: %s\n", myErrorName(status)); return; }
if (U_FAILURE(status)) { log_err("ucal_get() failed: %s\n", myErrorName(status)); return; }
expectedDOW = 1 + (DOW + delta - 1) % 7;
date1=ucal_getMillis(cal, &status);
if(FAILURE(status)){ log_err("ucal_getMiilis() failed: %s\n", myErrorName(status)); return;}
if(U_FAILURE(status)){ log_err("ucal_getMiilis() failed: %s\n", myErrorName(status)); return;}
if (newDOW != expectedDOW) {
log_err("Day of week should be %d instead of %d on %s", expectedDOW, newDOW,
austrdup(myDateFormat(datfor, date1)) );
@ -882,40 +882,40 @@ void testZones(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_t mn, int32
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "GMT");
gmtcal=ucal_open(tzID, 3, "en_US", UCAL_TRADITIONAL, &status);;
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_open failed: %s\n", myErrorName(status));
return;
}
u_uastrcpy(tzID, "PST");
cal = ucal_open(tzID, 3, "en_US", UCAL_TRADITIONAL, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_open failed: %s\n", myErrorName(status));
return;
}
datfor=udat_open(UDAT_MEDIUM,UDAT_MEDIUM ,NULL, fgGMTID,-1, &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("error in creating the dateformat : %s\n", myErrorName(status));
}
ucal_setDateTime(gmtcal, yr, mo - 1, dt, hr, mn, sc, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_setDateTime failed: %s\n", myErrorName(status));
return;
}
ucal_set(gmtcal, UCAL_MILLISECOND, 0);
date1 = ucal_getMillis(gmtcal, &status);
if (FAILURE(status)) { log_err("ucal_getMillis failed: %s\n", myErrorName(status)); return; }
if (U_FAILURE(status)) { log_err("ucal_getMillis failed: %s\n", myErrorName(status)); return; }
log_verbose("date = %s\n", austrdup(myDateFormat(datfor, date1)) );
ucal_setMillis(cal, date1, &status);
if (FAILURE(status)) { log_err("ucal_setMillis() failed: %s\n", myErrorName(status)); return; }
if (U_FAILURE(status)) { log_err("ucal_setMillis() failed: %s\n", myErrorName(status)); return; }
offset = ucal_get(cal, UCAL_ZONE_OFFSET, &status);
offset += ucal_get(cal, UCAL_DST_OFFSET, &status);
if (FAILURE(status)) { log_err("ucal_get() failed: %s\n", myErrorName(status)); return; }
if (U_FAILURE(status)) { log_err("ucal_get() failed: %s\n", myErrorName(status)); return; }
temp=(double)((double)offset / 1000.0 / 60.0 / 60.0);
/*printf("offset for %s %f hr\n", austrdup(myDateFormat(datfor, date1)), temp);*/
@ -923,7 +923,7 @@ void testZones(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_t mn, int32
ucal_get(cal, UCAL_MINUTE, &status)) * 60 +
ucal_get(cal, UCAL_SECOND, &status)) * 1000 +
ucal_get(cal, UCAL_MILLISECOND, &status) - offset;
if (FAILURE(status)) { log_err("ucal_get() failed: %s\n", myErrorName(status)); return; }
if (U_FAILURE(status)) { log_err("ucal_get() failed: %s\n", myErrorName(status)); return; }
expected = ((hr * 60 + mn) * 60 + sc) * 1000;
if (utc != expected) {
@ -961,7 +961,7 @@ void checkDateTime(UCalendar* c,
ucal_get(c, UCAL_MINUTE, &status) != min ||
ucal_get(c, UCAL_SECOND, &status) != sec ||
ucal_get(c, UCAL_MILLISECOND, &status) != ms) {
log_err("FAILURE for field %d, Expected y/m/d h:m:s:ms of %d/%d/%d %d:%d:%d:%d got %d/%d/%d %d:%d:%d:%d\n",
log_err("U_FAILURE for field %d, Expected y/m/d h:m:s:ms of %d/%d/%d %d:%d:%d:%d got %d/%d/%d %d:%d:%d:%d\n",
(int32_t)field, y, m + 1, d, hr, min, sec, ms,
ucal_get(c, UCAL_YEAR, &status),
ucal_get(c, UCAL_MONTH, &status) + 1,
@ -971,7 +971,7 @@ void checkDateTime(UCalendar* c,
ucal_get(c, UCAL_SECOND, &status),
ucal_get(c, UCAL_MILLISECOND, &status) );
if (FAILURE(status)){
if (U_FAILURE(status)){
log_err("ucal_get failed: %s\n", myErrorName(status));
return;
}
@ -996,7 +996,7 @@ void checkDate(UCalendar* c, int32_t y, int32_t m, int32_t d)
ucal_get(c, UCAL_MONTH, &status) + 1,
ucal_get(c, UCAL_DATE, &status) );
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_get failed: %s\n", myErrorName(status));
return;
}
@ -1018,13 +1018,13 @@ void verify1(const char* msg, UCalendar* c, UDateFormat* dat, int32_t year, int3
if (ucal_get(c, UCAL_YEAR, &status) == year &&
ucal_get(c, UCAL_MONTH, &status) == month &&
ucal_get(c, UCAL_DATE, &status) == day) {
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("FAIL: Calendar::get failed: %s\n", myErrorName(status));
return;
}
log_verbose("PASS: %s\n", msg);
d1=ucal_getMillis(c, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_getMillis failed: %s\n", myErrorName(status));
return;
}
@ -1033,7 +1033,7 @@ void verify1(const char* msg, UCalendar* c, UDateFormat* dat, int32_t year, int3
else {
log_err("FAIL: %s\n", msg);
d1=ucal_getMillis(c, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_getMillis failed: %s\n", myErrorName(status) );
return;
}
@ -1058,13 +1058,13 @@ void verify2(const char* msg, UCalendar* c, UDateFormat* dat, int32_t year, int3
ucal_get(c, UCAL_MINUTE, &status) == min &&
ucal_get(c, UCAL_SECOND, &status) == sec &&
ucal_get(c, UCAL_AM_PM, &status) == am_pm ){
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("FAIL: Calendar::get failed: %s\n", myErrorName(status));
return;
}
log_verbose("PASS: %s\n", msg);
d1=ucal_getMillis(c, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_getMillis failed: %s\n", myErrorName(status));
return;
}
@ -1073,7 +1073,7 @@ void verify2(const char* msg, UCalendar* c, UDateFormat* dat, int32_t year, int3
else {
log_err("FAIL: %s\n", msg);
d1=ucal_getMillis(c, &status);
if (FAILURE(status)) {
if (U_FAILURE(status)) {
log_err("ucal_getMillis failed: %s\n", myErrorName(status));
return;
}

78
icu4c/source/test/cintltst/ccapitst.c
View file

@ -11,11 +11,11 @@
*****************************************************************************************
********************************************************************************
*
* File CCAPITST.C
* File CU_CAPITST.C
*
* Modification History:
* Name Description
* Madhu Katragadda Ported for CAPI
* Madhu Katragadda Ported for C API
*********************************************************************************
*/
#include <stdio.h>
@ -39,8 +39,8 @@ void WriteToFile(const UChar *a, FILE *myfile);
/*Case insensitive compare*/
int32_t strCaseIcmp(const char* a1,const char * a2);
/*returns an action other than the one provided*/
UCNV_FromUCallBack otherUnicodeAction(UCNV_FromUCallBack MIA);
UCNV_ToUCallBack otherCharAction(UCNV_ToUCallBack MIA);
UConverterFromUCallback otherUnicodeAction(UConverterFromUCallback MIA);
UConverterToUCallback otherCharAction(UConverterToUCallback MIA);
void addTestConvert(TestNode** root)
@ -87,8 +87,8 @@ void TestConvert()
UErrorCode err = U_ZERO_ERROR;
const char* available_conv;
char ucs_file_name[UCS_FILE_NAME_SIZE];
UCNV_FromUCallBack MIA1;
UCNV_ToUCallBack MIA2;
UConverterFromUCallback MIA1;
UConverterToUCallback MIA2;
UChar myUnitarget[MAX_FILE_LEN];
UChar *myUnitarget_1 = myUnitarget;
UConverter* someConverters[5];
@ -163,20 +163,20 @@ void TestConvert()
};
const UCNV_PLATFORM CodePagesPlatform[NUM_CODEPAGE] =
const UConverterPlatform CodePagesPlatform[NUM_CODEPAGE] =
{
IBM
UCNV_IBM
};
const UCNV_ToUCallBack CodePagesMissingCharAction[NUM_CODEPAGE] =
const UConverterToUCallback CodePagesMissingCharAction[NUM_CODEPAGE] =
{
MissingCharAction_SUBSTITUTE
UCNV_TO_U_CALLBACK_SUBSTITUTE
};
const UCNV_FromUCallBack CodePagesMissingUnicodeAction[NUM_CODEPAGE] =
const UConverterFromUCallback CodePagesMissingUnicodeAction[NUM_CODEPAGE] =
{
MissingUnicodeAction_SUBSTITUTE
UCNV_FROM_U_CALLBACK_SUBSTITUTE
};
const char* CodePagesLocale[NUM_CODEPAGE] =
@ -219,19 +219,19 @@ void TestConvert()
/*Testing ucnv_open()*/
someConverters[0] = ucnv_open("ibm-949", &err);
if (FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err)); }
if (U_FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err)); }
someConverters[1] = ucnv_open("ibm-949", &err);
if (FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err)); }
if (U_FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err)); }
someConverters[2] = ucnv_open("ibm-949", &err);
if (FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err)); }
if (U_FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err)); }
someConverters[3] = ucnv_open("ibm-834", &err);
if (FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err)); }
if (U_FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err)); }
someConverters[4] = ucnv_open("ibm-943", &err);
if (FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err));}
if (U_FAILURE(err)) { log_err("FAILURE! %s\n", myErrorName(err));}
/* Testing ucnv_flushCache() */
log_verbose("\n---Testing ucnv_flushCache...\n");
@ -263,8 +263,8 @@ void TestConvert()
someConverters[0] = ucnv_open(NULL,&err);
someConverters[1] = ucnv_open(NULL,&err);
someConverters[2] = ucnv_open("utf8", &err);
someConverters[3] = ucnv_openCCSID(949,IBM,&err);
if (FAILURE(err)){ log_err("FAILURE! %s\n", myErrorName(err));}
someConverters[3] = ucnv_openCCSID(949,UCNV_IBM,&err);
if (U_FAILURE(err)){ log_err("FAILURE! %s\n", myErrorName(err));}
/* Testing ucnv_getName()*/
/*default code page */
@ -333,10 +333,10 @@ void TestConvert()
/*Creates a converter and testing ucnv_openCCSID(u_int code_page, platform, errstatus*/
/* myConverter =ucnv_openCCSID(CodePageNumberToTest[codepage_index],IBM, &err); */
/* myConverter =ucnv_openCCSID(CodePageNumberToTest[codepage_index],UCNV_IBM, &err); */
/* ucnv_flushCache(); */
myConverter =ucnv_open( "ibm-949", &err);
if (!myConverter || FAILURE(err))
if (!myConverter || U_FAILURE(err))
{
log_err("Error creating the convertor \n");
@ -346,7 +346,7 @@ void TestConvert()
/*testing for ucnv_getName() */
log_verbose("Testing ucnv_getName()...\n");
ucnv_getName(myConverter, &err);
if(FAILURE(err))
if(U_FAILURE(err))
log_err("Error in getName\n");
else
{
@ -387,10 +387,10 @@ void TestConvert()
log_verbose("\n---Testing ucnv_setSubstChars RoundTrip Test ...\n");
ucnv_setSubstChars(myConverter, myptr, ii, &err);
if (FAILURE(err))
if (U_FAILURE(err))
{ log_err("FAILURE! %s\n", myErrorName(err)); }
ucnv_getSubstChars(myConverter,save, &ii, &err);
if (FAILURE(err))
if (U_FAILURE(err))
{ log_err("FAILURE! %s\n", myErrorName(err)); }
if (strncmp(save, myptr, ii))
@ -419,7 +419,7 @@ void TestConvert()
err=U_ZERO_ERROR;
displayname=(UChar*)realloc(displayname, (disnamelen+1) * sizeof(UChar));
ucnv_getDisplayName(myConverter,locale,displayname,disnamelen+1, &err);
if(FAILURE(err))
if(U_FAILURE(err))
{
log_err("getDisplayName failed the error is %s\n", myErrorName(err));
}
@ -434,7 +434,7 @@ void TestConvert()
log_verbose("\n---Testing ucnv_setFromUCallBack...\n");
ucnv_setFromUCallBack(myConverter,otherUnicodeAction(MIA1), &err);
if (FAILURE(err))
if (U_FAILURE(err))
{ log_err("FAILURE! %s\n", myErrorName(err)); }
if (ucnv_getFromUCallBack(myConverter) != otherUnicodeAction(MIA1))
@ -444,7 +444,7 @@ void TestConvert()
log_verbose("\n---Testing getFromUCallBack Roundtrip...\n");
ucnv_setFromUCallBack(myConverter,MIA1, &err);
if (FAILURE(err))
if (U_FAILURE(err))
{ log_err("FAILURE! %s\n", myErrorName(err)); }
if (ucnv_getFromUCallBack(myConverter)!= MIA1)
@ -459,7 +459,7 @@ void TestConvert()
log_verbose("\n---Testing setTo UCallBack...\n");
ucnv_setToUCallBack(myConverter,otherCharAction(MIA2),&err);
if (FAILURE(err))
if (U_FAILURE(err))
{ log_err("FAILURE! %s\n", myErrorName(err));}
if (ucnv_getToUCallBack(myConverter) != otherCharAction(MIA2))
@ -469,7 +469,7 @@ void TestConvert()
log_verbose("\n---Testing setTo UCallBack Roundtrip...\n");
ucnv_setToUCallBack(myConverter,MIA2, &err);
if (FAILURE(err))
if (U_FAILURE(err))
{ log_err("FAILURE! %s\n", myErrorName(err)); }
if (ucnv_getToUCallBack(myConverter) != MIA2)
@ -481,7 +481,7 @@ void TestConvert()
/*getcodepageid testing ucnv_getCCSID() */
log_verbose("\n----Testing getCCSID....\n");
cp = ucnv_getCCSID(myConverter,&err);
if (FAILURE(err))
if (U_FAILURE(err))
{
log_err("FAILURE!..... %s\n", myErrorName(err));
}
@ -499,7 +499,7 @@ void TestConvert()
else
log_verbose("Platform codepage test ok\n");
if (FAILURE(err))
if (U_FAILURE(err))
{
log_err("FAILURE! %s\n", myErrorName(err));
}
@ -542,7 +542,7 @@ void TestConvert()
testLong1 = MAX_FILE_LEN;
log_verbose("\n---Testing ucnv_fromUChars()\n");
targetcapacity = ucnv_fromUChars(myConverter, output_cp_buffer, testLong1, uchar1, &err);
if (FAILURE(err))
if (U_FAILURE(err))
{
log_err("\nFAILURE...%s\n", myErrorName(err));
}
@ -574,7 +574,7 @@ void TestConvert()
strlen(output_cp_buffer),
&err);
if(FAILURE(err))
if(U_FAILURE(err))
log_err("ucnv_toUChars() FAILED %s\n", myErrorName(err));
else
log_verbose(" ucnv_toUChars() o.k.\n");
@ -596,7 +596,7 @@ void TestConvert()
&err);
consumedUni = (UChar*)tmp_consumedUni;
if (FAILURE(err))
if (U_FAILURE(err))
{
log_err("FAILURE! %s\n", myErrorName(err));
}
@ -615,7 +615,7 @@ void TestConvert()
FALSE,
&err);
consumed = (char*)tmp_consumed;
if (FAILURE(err))
if (U_FAILURE(err))
{ log_err("FAILURE! %s\n", myErrorName(err)); }
else
log_verbose("ucnv_toUnicode() o.k.\n");
@ -675,14 +675,14 @@ int32_t strCaseIcmp(const char* a1, const char * a2)
return ret;
}
UCNV_FromUCallBack otherUnicodeAction(UCNV_FromUCallBack MIA)
UConverterFromUCallback otherUnicodeAction(UConverterFromUCallback MIA)
{
return (MIA==(UCNV_FromUCallBack)MissingUnicodeAction_STOP)?(UCNV_FromUCallBack)MissingUnicodeAction_SUBSTITUTE:(UCNV_FromUCallBack)MissingUnicodeAction_STOP;
return (MIA==(UConverterFromUCallback)UCNV_FROM_U_CALLBACK_STOP)?(UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SUBSTITUTE:(UConverterFromUCallback)UCNV_FROM_U_CALLBACK_STOP;
}
UCNV_ToUCallBack otherCharAction(UCNV_ToUCallBack MIA)
UConverterToUCallback otherCharAction(UConverterToUCallback MIA)
{
return (MIA==(UCNV_ToUCallBack)MissingCharAction_STOP)?(UCNV_ToUCallBack)MissingCharAction_SUBSTITUTE:(UCNV_ToUCallBack)MissingCharAction_STOP;
return (MIA==(UConverterToUCallback)UCNV_TO_U_CALLBACK_STOP)?(UConverterToUCallback)UCNV_TO_U_CALLBACK_SUBSTITUTE:(UConverterToUCallback)UCNV_TO_U_CALLBACK_STOP;
}

4
icu4c/source/test/cintltst/ccurrtst.c
View file

@ -15,7 +15,7 @@
*
* Modification History:
* Name Description
* Madhu Katragadda Ported for CAPI
* Madhu Katragadda Ported for C API
*********************************************************************************
*/
@ -72,7 +72,7 @@ void currTest()
UCollationResult expectedResult = UCOL_EQUAL;
log_verbose("Testing currency of all locales\n");
c = ucol_open(NULL, &status);
if (FAILURE(status))
if (U_FAILURE(status))
{
log_err("collator open failed! :%s\n", myErrorName(status));
return;

6
icu4c/source/test/cintltst/cdantst.c
View file

@ -15,7 +15,7 @@
*
* Modification History:
* Name Description
* Madhu Katragadda Ported for CAPI
* Madhu Katragadda Ported for C API
*********************************************************************************
/**
* CollationDanishTest is a third level test class. This tests the locale
@ -225,7 +225,7 @@ void TestTertiary( )
int32_t i,j;
UErrorCode status = U_ZERO_ERROR;
myCollation = ucol_open("da_DK", &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
}
ucol_setStrength(myCollation, UCOL_TERTIARY);
@ -255,7 +255,7 @@ void TestPrimary()
int32_t i;
UErrorCode status = U_ZERO_ERROR;
myCollation = ucol_open("da_DK", &status);
if(FAILURE(status)){
if(U_FAILURE(status)){
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
}
ucol_setStrength(myCollation, UCOL_PRIMARY);

Some files were not shown because too many files have changed in this diff Show more