diff --git a/icu4c/source/common/bidi.h b/icu4c/source/common/bidi.h index d9ba9211853..8a0b870fa5f 100644 --- a/icu4c/source/common/bidi.h +++ b/icu4c/source/common/bidi.h @@ -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; diff --git a/icu4c/source/common/common.dsp b/icu4c/source/common/common.dsp index 360d961adc7..9d548f024a0 100644 --- a/icu4c/source/common/common.dsp +++ b/icu4c/source/common/common.dsp @@ -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 diff --git a/icu4c/source/common/convert.cpp b/icu4c/source/common/convert.cpp index 5c7e7f8bf99..1d42bffdb08 100644 --- a/icu4c/source/common/convert.cpp +++ b/icu4c/source/common/convert.cpp @@ -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); } diff --git a/icu4c/source/common/convert.h b/icu4c/source/common/convert.h index 1669b2baded..d1382739d0c 100644 --- a/icu4c/source/common/convert.h +++ b/icu4c/source/common/convert.h @@ -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); diff --git a/icu4c/source/common/cpputils.cpp b/icu4c/source/common/cpputils.cpp index fa4fb1b42f4..2c5cc4a6f12 100644 --- a/icu4c/source/common/cpputils.cpp +++ b/icu4c/source/common/cpputils.cpp @@ -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; } } diff --git a/icu4c/source/common/cpputils.h b/icu4c/source/common/cpputils.h index f7a81769cba..b4bdbafa85b 100644 --- a/icu4c/source/common/cpputils.h +++ b/icu4c/source/common/cpputils.h @@ -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, diff --git a/icu4c/source/common/cstring.h b/icu4c/source/common/cstring.h index f27fe1135dd..8b2ddac3697 100644 --- a/icu4c/source/common/cstring.h +++ b/icu4c/source/common/cstring.h @@ -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 */ diff --git a/icu4c/source/common/filestrm.c b/icu4c/source/common/filestrm.c index 9cd19c075ef..e74edab2250 100644 --- a/icu4c/source/common/filestrm.c +++ b/icu4c/source/common/filestrm.c @@ -30,7 +30,7 @@ #include -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; diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp index c471044ec8b..397115a4ef8 100644 --- a/icu4c/source/common/locid.cpp +++ b/icu4c/source/common/locid.cpp @@ -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; diff --git a/icu4c/source/common/locid.h b/icu4c/source/common/locid.h index d0481a8219e..3ad6192208a 100644 --- a/icu4c/source/common/locid.h +++ b/icu4c/source/common/locid.h @@ -171,10 +171,11 @@ * */ 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; diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp index 0bd2ac1fd13..bb4697d54be 100644 --- a/icu4c/source/common/locmap.cpp +++ b/icu4c/source/common/locmap.cpp @@ -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); diff --git a/icu4c/source/common/locmap.h b/icu4c/source/common/locmap.h index eaa86eee049..db6dd4de62b 100644 --- a/icu4c/source/common/locmap.h +++ b/icu4c/source/common/locmap.h @@ -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 diff --git a/icu4c/source/common/normlzr.cpp b/icu4c/source/common/normlzr.cpp index 09fc2ff58c4..30a2fa57f84 100644 --- a/icu4c/source/common/normlzr.cpp +++ b/icu4c/source/common/normlzr.cpp @@ -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(); diff --git a/icu4c/source/common/putil.c b/icu4c/source/common/putil.c index bb53e6b7dae..131aceb659a 100644 --- a/icu4c/source/common/putil.c +++ b/icu4c/source/common/putil.c @@ -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() diff --git a/icu4c/source/common/rbdata.cpp b/icu4c/source/common/rbdata.cpp index d2843d26330..54b6989fb5e 100644 --- a/icu4c/source/common/rbdata.cpp +++ b/icu4c/source/common/rbdata.cpp @@ -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; } diff --git a/icu4c/source/common/rbread.cpp b/icu4c/source/common/rbread.cpp index d9920d38005..b89b4505b93 100644 --- a/icu4c/source/common/rbread.cpp +++ b/icu4c/source/common/rbread.cpp @@ -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; } diff --git a/icu4c/source/common/resbund.cpp b/icu4c/source/common/resbund.cpp index 839f0c8580e..e748038fc15 100644 --- a/icu4c/source/common/resbund.cpp +++ b/icu4c/source/common/resbund.cpp @@ -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; } diff --git a/icu4c/source/common/resbund.h b/icu4c/source/common/resbund.h index 158d1c2161c..4f4668bfabb 100644 --- a/icu4c/source/common/resbund.h +++ b/icu4c/source/common/resbund.h @@ -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 diff --git a/icu4c/source/common/scsu.c b/icu4c/source/common/scsu.c index b2725429921..ec4ac030e61 100644 --- a/icu4c/source/common/scsu.c +++ b/icu4c/source/common/scsu.c @@ -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; diff --git a/icu4c/source/common/scsu.h b/icu4c/source/common/scsu.h index 38a5b04fe36..2ad89d52141 100644 --- a/icu4c/source/common/scsu.h +++ b/icu4c/source/common/scsu.h @@ -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, diff --git a/icu4c/source/common/ubidi.c b/icu4c/source/common/ubidi.c index 7382f7467e3..d7a86cb4801 100644 --- a/icu4c/source/common/ubidi.c +++ b/icu4c/source/common/ubidi.c @@ -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_LEVELlevels=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; diff --git a/icu4c/source/common/ubidi.h b/icu4c/source/common/ubidi.h index 8d0d502ed11..725fc50c742 100644 --- a/icu4c/source/common/ubidi.h +++ b/icu4c/source/common/ubidi.h @@ -164,7 +164,7 @@ typedef struct UBiDi UBiDi; * * @return An empty UBiDi object. */ -CAPI UBiDi * U_EXPORT2 +U_CAPI UBiDi * U_EXPORT2 ubidi_open(); /** @@ -201,7 +201,7 @@ ubidi_open(); * * @return An empty UBiDi 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 NULL 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.

* The index map will result in indexMap[logicalIndex]==visualIndex. */ -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.

* The index map will result in indexMap[visualIndex]==logicalIndex. */ -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 *  UBiDiLevel level; *  *  count=ubidi_countRuns(para, pErrorCode); - *  if(SUCCESS(*pErrorCode)) { + *  if(U_SUCCESS(*pErrorCode)) { *  if(styleRunCount<=1) { *  Style style=styleRuns[0].style; *  @@ -806,7 +806,7 @@ ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset len *  UErrorCode *pErrorCode) { *  UBiDi *para; *  - *  if(pErrorCode==NULL || FAILURE(*pErrorCode) || length<=0) { + *  if(pErrorCode==NULL || U_FAILURE(*pErrorCode) || length<=0) { *  return; *  } *  @@ -816,7 +816,7 @@ ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset len *  ubidi_setPara(para, text, length, *  textDirection ? UBIDI_DEFAULT_RTL : UBIDI_DEFAULT_LTR, *  NULL, pErrorCode); - *  if(SUCCESS(*pErrorCode)) { + *  if(U_SUCCESS(*pErrorCode)) { *  UBiDiLevel paraLevel=1&ubidi_getParaLevel(para); *  StyleRun styleRun={ length, styleNormal }; *  int width; @@ -853,7 +853,7 @@ ubidi_invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset len *  styleRuns, styleRunStart, &styleRunLimit, *  &width); *  ubidi_setLine(para, start, limit, line, pErrorCode); - *  if(SUCCESS(*pErrorCode)) { + *  if(U_SUCCESS(*pErrorCode)) { *  // prepare rendering a new line *  // from either left or right *  startLine(paraLevel, width); diff --git a/icu4c/source/common/ubidiln.c b/icu4c/source/common/ubidiln.c index d257a77d1e8..7fb97ecf2d7 100644 --- a/icu4c/source/common/ubidiln.c +++ b/icu4c/source/common/ubidiln.c @@ -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; diff --git a/icu4c/source/common/uchar.c b/icu4c/source/common/uchar.c index 392e16a7c45..08a23deaa84 100644 --- a/icu4c/source/common/uchar.c +++ b/icu4c/source/common/uchar.c @@ -32,6 +32,25 @@ #include +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; diff --git a/icu4c/source/common/uchar.h b/icu4c/source/common/uchar.h index a0a674b51cf..55b60e8cbfe 100644 --- a/icu4c/source/common/uchar.h +++ b/icu4c/source/common/uchar.h @@ -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. - *

- * 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. - *

- */ - - - 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*/ diff --git a/icu4c/source/common/ucmp16.h b/icu4c/source/common/ucmp16.h index fac61f06c0d..6f0a279d5ee 100644 --- a/icu4c/source/common/ucmp16.h +++ b/icu4c/source/common/ucmp16.h @@ -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); diff --git a/icu4c/source/common/ucmp32.h b/icu4c/source/common/ucmp32.h index 3f63be064d2..f7137fa31c1 100644 --- a/icu4c/source/common/ucmp32.h +++ b/icu4c/source/common/ucmp32.h @@ -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); diff --git a/icu4c/source/common/ucnv.c b/icu4c/source/common/ucnv.c index 708ad7e4e8a..655ecbc3fe8 100644 --- a/icu4c/source/common/ucnv.c +++ b/icu4c/source/common/ucnv.c @@ -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; isharedData->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; diff --git a/icu4c/source/common/ucnv.h b/icu4c/source/common/ucnv.h index 3268261126c..31b34306622 100644 --- a/icu4c/source/common/ucnv.h +++ b/icu4c/source/common/ucnv.h @@ -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 * U_INDEX_OUTOFBOUNDS_ERROR 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 * U_INDEX_OUTOFBOUNDS_ERROR 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 NULL or if converter's data table is NULL. * @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 NULL 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 diff --git a/icu4c/source/common/ucnv_bld.c b/icu4c/source/common/ucnv_bld.c index 1251f56aa50..95ea1ee2421 100644 --- a/icu4c/source/common/ucnv_bld.c +++ b/icu4c/source/common/ucnv_bld.c @@ -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; diff --git a/icu4c/source/common/ucnv_cnv.c b/icu4c/source/common/ucnv_cnv.c index ad06ba0c8cf..64e717a4e45 100644 --- a/icu4c/source/common/ucnv_cnv.c +++ b/icu4c/source/common/ucnv_cnv.c @@ -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); diff --git a/icu4c/source/common/ucnv_err.c b/icu4c/source/common/ucnv_err.c index 2c4d175da6c..acc83bf026f 100644 --- a/icu4c/source/common/ucnv_err.c +++ b/icu4c/source/common/ucnv_err.c @@ -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 */ diff --git a/icu4c/source/common/ucnv_err.h b/icu4c/source/common/ucnv_err.h index 0b349bbb7eb..aabb0b32959 100644 --- a/icu4c/source/common/ucnv_err.h +++ b/icu4c/source/common/ucnv_err.h @@ -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, diff --git a/icu4c/source/common/ucnv_imp.h b/icu4c/source/common/ucnv_imp.h new file mode 100644 index 00000000000..9360f7a61ff --- /dev/null +++ b/icu4c/source/common/ucnv_imp.h @@ -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 */ diff --git a/icu4c/source/common/ucnv_io.c b/icu4c/source/common/ucnv_io.c index 8e9505b6436..74d95e5d43a 100644 --- a/icu4c/source/common/ucnv_io.c +++ b/icu4c/source/common/ucnv_io.c @@ -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 ()); diff --git a/icu4c/source/common/uhash.c b/icu4c/source/common/uhash.c index 1d236030999..9e1be5b2521 100644 --- a/icu4c/source/common/uhash.c +++ b/icu4c/source/common/uhash.c @@ -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; diff --git a/icu4c/source/common/uhash.h b/icu4c/source/common/uhash.h index e5fbebbfb4e..2a874771fe3 100644 --- a/icu4c/source/common/uhash.h +++ b/icu4c/source/common/uhash.h @@ -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 diff --git a/icu4c/source/common/uloc.c b/icu4c/source/common/uloc.c index 5763d2e3d6f..3530fd88731 100644 --- a/icu4c/source/common/uloc.c +++ b/icu4c/source/common/uloc.c @@ -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) diff --git a/icu4c/source/common/uloc.h b/icu4c/source/common/uloc.h index 9bb65ad959d..298857b546d 100644 --- a/icu4c/source/common/uloc.h +++ b/icu4c/source/common/uloc.h @@ -95,7 +95,7 @@ * for the United States: *

* 
- * .      uloc_US
+ * .      ULOC_US
  *
*
* @@ -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 */ diff --git a/icu4c/source/common/umutex.c b/icu4c/source/common/umutex.c index 0df23320d0e..4cf085051dc 100644 --- a/icu4c/source/common/umutex.c +++ b/icu4c/source/common/umutex.c @@ -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 diff --git a/icu4c/source/common/unistr.cpp b/icu4c/source/common/unistr.cpp index 97b076883f6..d0490681887 100644 --- a/icu4c/source/common/unistr.cpp +++ b/icu4c/source/common/unistr.cpp @@ -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; } diff --git a/icu4c/source/common/ures.cpp b/icu4c/source/common/ures.cpp index 23ddfa398a7..b3db31da37a 100644 --- a/icu4c/source/common/ures.cpp +++ b/icu4c/source/common/ures.cpp @@ -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; diff --git a/icu4c/source/common/ures.h b/icu4c/source/common/ures.h index ed5cf9775d8..7ec8c5e58e0 100644 --- a/icu4c/source/common/ures.h +++ b/icu4c/source/common/ures.h @@ -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*/ diff --git a/icu4c/source/common/utypes.h b/icu4c/source/common/utypes.h index 457fb361ead..72412788022 100644 --- a/icu4c/source/common/utypes.h +++ b/icu4c/source/common/utypes.h @@ -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 diff --git a/icu4c/source/extra/ustdio/locbund.c b/icu4c/source/extra/ustdio/locbund.c index b405a4ffe04..7e503f94190 100644 --- a/icu4c/source/extra/ustdio/locbund.c +++ b/icu4c/source/extra/ustdio/locbund.c @@ -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; } diff --git a/icu4c/source/extra/ustdio/loccache.c b/icu4c/source/extra/ustdio/loccache.c index 8b3876d7585..dffcc52047a 100644 --- a/icu4c/source/extra/ustdio/loccache.c +++ b/icu4c/source/extra/ustdio/loccache.c @@ -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); diff --git a/icu4c/source/extra/ustdio/ufile.c b/icu4c/source/extra/ustdio/ufile.c index 929db270784..1b6ca6d8cd1 100644 --- a/icu4c/source/extra/ustdio/ufile.c +++ b/icu4c/source/extra/ustdio/ufile.c @@ -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; } diff --git a/icu4c/source/extra/ustdio/ufmt_cmn.c b/icu4c/source/extra/ustdio/ufmt_cmn.c index 9f9fb88d687..0faf671e3c1 100644 --- a/icu4c/source/extra/ustdio/ufmt_cmn.c +++ b/icu4c/source/extra/ustdio/ufmt_cmn.c @@ -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 */ diff --git a/icu4c/source/extra/ustdio/uscanf.c b/icu4c/source/extra/ustdio/uscanf.c index c00e685fb74..35530fabc68 100644 --- a/icu4c/source/extra/ustdio/uscanf.c +++ b/icu4c/source/extra/ustdio/uscanf.c @@ -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 */ diff --git a/icu4c/source/extra/ustdio/ustdio.h b/icu4c/source/extra/ustdio/ustdio.h index 6e59242fc18..eecaa7b45d7 100644 --- a/icu4c/source/extra/ustdio/ustdio.h +++ b/icu4c/source/extra/ustdio/ustdio.h @@ -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 must not 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 f. */ -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 f. * @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 f. */ -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 f. * @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 s. * @return A pointer to s, 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 c. * @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); diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp index 7c0b5020100..307e652d1c7 100644 --- a/icu4c/source/i18n/calendar.cpp +++ b/icu4c/source/i18n/calendar.cpp @@ -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 diff --git a/icu4c/source/i18n/calendar.h b/icu4c/source/i18n/calendar.h index c577a88f2de..bcda31e8621 100644 --- a/icu4c/source/i18n/calendar.h +++ b/icu4c/source/i18n/calendar.h @@ -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: diff --git a/icu4c/source/i18n/choicfmt.cpp b/icu4c/source/i18n/choicfmt.cpp index 54a14b0fac2..0d9b63be7f7 100644 --- a/icu4c/source/i18n/choicfmt.cpp +++ b/icu4c/source/i18n/choicfmt.cpp @@ -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; } diff --git a/icu4c/source/i18n/choicfmt.h b/icu4c/source/i18n/choicfmt.h index 2be056d30e0..7fb7e05f865 100644 --- a/icu4c/source/i18n/choicfmt.h +++ b/icu4c/source/i18n/choicfmt.h @@ -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: * * @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(); diff --git a/icu4c/source/i18n/coleitr.cpp b/icu4c/source/i18n/coleitr.cpp index 62d44f8c27a..a04c4f13e91 100644 --- a/icu4c/source/i18n/coleitr.cpp +++ b/icu4c/source/i18n/coleitr.cpp @@ -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; } diff --git a/icu4c/source/i18n/coll.h b/icu4c/source/i18n/coll.h index bfaa1fc93d6..1720f19dc01 100644 --- a/icu4c/source/i18n/coll.h +++ b/icu4c/source/i18n/coll.h @@ -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 : * 
    * .       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 :
    * 
    * .       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 :
    * 
    * .       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 < CollationKey2)
    * .       result = CollationKey1.compareTo(CollationKey2);
@@ -416,7 +416,7 @@ public :
    * 
    * .       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:
   /**
diff --git a/icu4c/source/i18n/datefmt.cpp b/icu4c/source/i18n/datefmt.cpp
index a1747bf3910..46e9317e5f0 100644
--- a/icu4c/source/i18n/datefmt.cpp
+++ b/icu4c/source/i18n/datefmt.cpp
@@ -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];
             }
diff --git a/icu4c/source/i18n/dcfmtsym.cpp b/icu4c/source/i18n/dcfmtsym.cpp
index a7db4e4c657..1185b692826 100644
--- a/icu4c/source/i18n/dcfmtsym.cpp
+++ b/icu4c/source/i18n/dcfmtsym.cpp
@@ -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.
diff --git a/icu4c/source/i18n/decimfmt.cpp b/icu4c/source/i18n/decimfmt.cpp
index da2409e1752..ee8371359e3 100644
--- a/icu4c/source/i18n/decimfmt.cpp
+++ b/icu4c/source/i18n/decimfmt.cpp
@@ -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;
diff --git a/icu4c/source/i18n/decimfmt.h b/icu4c/source/i18n/decimfmt.h
index e6a807cd2f5..0b28d523931 100644
--- a/icu4c/source/i18n/decimfmt.h
+++ b/icu4c/source/i18n/decimfmt.h
@@ -784,7 +784,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; }
 
     /**
      * 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;
diff --git a/icu4c/source/i18n/dtfmtsym.cpp b/icu4c/source/i18n/dtfmtsym.cpp
index a87d042a51d..2eee0e9fbf7 100644
--- a/icu4c/source/i18n/dtfmtsym.cpp
+++ b/icu4c/source/i18n/dtfmtsym.cpp
@@ -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)
         {
diff --git a/icu4c/source/i18n/format.cpp b/icu4c/source/i18n/format.cpp
index 0dcc3a96168..fdc8260a328 100644
--- a/icu4c/source/i18n/format.cpp
+++ b/icu4c/source/i18n/format.cpp
@@ -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);
diff --git a/icu4c/source/i18n/gregocal.cpp b/icu4c/source/i18n/gregocal.cpp
index 970303d73b0..75e5bbc0107 100644
--- a/icu4c/source/i18n/gregocal.cpp
+++ b/icu4c/source/i18n/gregocal.cpp
@@ -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;
 }
 
 // -------------------------------------
diff --git a/icu4c/source/i18n/gregocal.h b/icu4c/source/i18n/gregocal.h
index 0207342c20c..2c1dc3f7906 100644
--- a/icu4c/source/i18n/gregocal.h
+++ b/icu4c/source/i18n/gregocal.h
@@ -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:
 
diff --git a/icu4c/source/i18n/mergecol.cpp b/icu4c/source/i18n/mergecol.cpp
index 16379688651..e7afd75356d 100644
--- a/icu4c/source/i18n/mergecol.cpp
+++ b/icu4c/source/i18n/mergecol.cpp
@@ -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;
     }
diff --git a/icu4c/source/i18n/msgfmt.cpp b/icu4c/source/i18n/msgfmt.cpp
index d5d402acd5a..dc0905e23ab 100644
--- a/icu4c/source/i18n/msgfmt.cpp
+++ b/icu4c/source/i18n/msgfmt.cpp
@@ -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 = ""); // _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;
diff --git a/icu4c/source/i18n/msgfmt.h b/icu4c/source/i18n/msgfmt.h
index 8204ee50c78..5a86b615ec4 100644
--- a/icu4c/source/i18n/msgfmt.h
+++ b/icu4c/source/i18n/msgfmt.h
@@ -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:
      * 

      * @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(); 
diff --git a/icu4c/source/i18n/numfmt.cpp b/icu4c/source/i18n/numfmt.cpp
index 537bf8a59c9..3ea9ee891ec 100644
--- a/icu4c/source/i18n/numfmt.cpp
+++ b/icu4c/source/i18n/numfmt.cpp
@@ -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;
 }
 
diff --git a/icu4c/source/i18n/numfmt.h b/icu4c/source/i18n/numfmt.h
index 278fdc06c93..968da0692e9 100644
--- a/icu4c/source/i18n/numfmt.h
+++ b/icu4c/source/i18n/numfmt.h
@@ -442,7 +442,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; }
 
     /**
      * 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:
 
diff --git a/icu4c/source/i18n/ptnentry.cpp b/icu4c/source/i18n/ptnentry.cpp
index 1f96ae6b9c1..d17777095d2 100644
--- a/icu4c/source/i18n/ptnentry.cpp
+++ b/icu4c/source/i18n/ptnentry.cpp
@@ -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;
   }
 }
diff --git a/icu4c/source/i18n/simpletz.cpp b/icu4c/source/i18n/simpletz.cpp
index d51f5e35636..8765edf2ade 100644
--- a/icu4c/source/i18n/simpletz.cpp
+++ b/icu4c/source/i18n/simpletz.cpp
@@ -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;
         }
diff --git a/icu4c/source/i18n/smpdtfmt.cpp b/icu4c/source/i18n/smpdtfmt.cpp
index d11fe7f8eed..627ef8298d8 100644
--- a/icu4c/source/i18n/smpdtfmt.cpp
+++ b/icu4c/source/i18n/smpdtfmt.cpp
@@ -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);
diff --git a/icu4c/source/i18n/smpdtfmt.h b/icu4c/source/i18n/smpdtfmt.h
index cf02bd17d2e..03fa03fd781 100644
--- a/icu4c/source/i18n/smpdtfmt.h
+++ b/icu4c/source/i18n/smpdtfmt.h
@@ -449,7 +449,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; } /** * 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; diff --git a/icu4c/source/i18n/sortkey.h b/icu4c/source/i18n/sortkey.h index a32a01b5f67..f1ec903549f 100644 --- a/icu4c/source/i18n/sortkey.h +++ b/icu4c/source/i18n/sortkey.h @@ -175,13 +175,13 @@ public : * 
      * .    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()
      *
* @return the hash value based on the string's collation order. diff --git a/icu4c/source/i18n/tblcoll.cpp b/icu4c/source/i18n/tblcoll.cpp index 5f15e725558..1278f84bd35 100644 --- a/icu4c/source/i18n/tblcoll.cpp +++ b/icu4c/source/i18n/tblcoll.cpp @@ -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; diff --git a/icu4c/source/i18n/tblcoll.h b/icu4c/source/i18n/tblcoll.h index 4aa933eec20..9acbc13b3f9 100644 --- a/icu4c/source/i18n/tblcoll.h +++ b/icu4c/source/i18n/tblcoll.h @@ -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 diff --git a/icu4c/source/i18n/timezone.cpp b/icu4c/source/i18n/timezone.cpp index bdd871dd7fd..074147d9cfd 100644 --- a/icu4c/source/i18n/timezone.cpp +++ b/icu4c/source/i18n/timezone.cpp @@ -74,7 +74,7 @@ UnicodeString TimeZone::kLastResortID("Africa/Casablanca"); // GMT UnicodeString* TimeZone::fgAvailableIDs = 0; int32_t TimeZone::fgAvailableIDsCount = 0; -const int32_t TimeZone::millisPerHour = kMillisPerHour; +const int32_t TimeZone::millisPerHour = U_MILLIS_PER_HOUR; const UnicodeString TimeZone::GMT_ID = "GMT"; const int32_t TimeZone::GMT_ID_LENGTH = 3; @@ -98,7 +98,7 @@ TimeZone::initSystemTimeZones(void) if (kSystemInited == FALSE) { kSystemInited = TRUE; // Migration from Java: - // - replace ONE_HOUR with kMillisPerHour + // - replace ONE_HOUR with U_MILLIS_PER_HOUR // - replace (int) with (int32_t) // The following data is current as of 1998. @@ -108,1674 +108,1674 @@ TimeZone::initSystemTimeZones(void) //---------------------------------------------------------- kSystemTimeZones[0] = - new SimpleTimeZone(-11*kMillisPerHour, "Pacific/Niue" /*NUT*/); + new SimpleTimeZone(-11*U_MILLIS_PER_HOUR, "Pacific/Niue" /*NUT*/); // Pacific/Niue Niue(NU) -11:00 - NUT //---------------------------------------------------------- kSystemTimeZones[1] = - new SimpleTimeZone(-11*kMillisPerHour, "Pacific/Apia" /*WST*/); + new SimpleTimeZone(-11*U_MILLIS_PER_HOUR, "Pacific/Apia" /*WST*/); // Pacific/Apia W Samoa(WS) -11:00 - WST # W Samoa Time kSystemTimeZones[2] = - new SimpleTimeZone(-11*kMillisPerHour, "MIT" /*alias for Pacific/Apia*/); + new SimpleTimeZone(-11*U_MILLIS_PER_HOUR, "MIT" /*alias for Pacific/Apia*/); //---------------------------------------------------------- kSystemTimeZones[3] = - new SimpleTimeZone(-11*kMillisPerHour, "Pacific/Pago_Pago" /*SST*/); + new SimpleTimeZone(-11*U_MILLIS_PER_HOUR, "Pacific/Pago_Pago" /*SST*/); // Pacific/Pago_Pago American Samoa(US) -11:00 - SST # S=Samoa //---------------------------------------------------------- kSystemTimeZones[4] = - new SimpleTimeZone(-10*kMillisPerHour, "Pacific/Tahiti" /*TAHT*/); + new SimpleTimeZone(-10*U_MILLIS_PER_HOUR, "Pacific/Tahiti" /*TAHT*/); // Pacific/Tahiti French Polynesia(PF) -10:00 - TAHT # Tahiti Time //---------------------------------------------------------- kSystemTimeZones[5] = - new SimpleTimeZone(-10*kMillisPerHour, "Pacific/Fakaofo" /*TKT*/); + new SimpleTimeZone(-10*U_MILLIS_PER_HOUR, "Pacific/Fakaofo" /*TKT*/); // Pacific/Fakaofo Tokelau Is(TK) -10:00 - TKT # Tokelau Time //---------------------------------------------------------- kSystemTimeZones[6] = - new SimpleTimeZone(-10*kMillisPerHour, "Pacific/Honolulu" /*HST*/); + new SimpleTimeZone(-10*U_MILLIS_PER_HOUR, "Pacific/Honolulu" /*HST*/); // Pacific/Honolulu Hawaii(US) -10:00 - HST kSystemTimeZones[7] = - new SimpleTimeZone(-10*kMillisPerHour, "HST" /*alias for Pacific/Honolulu*/); + new SimpleTimeZone(-10*U_MILLIS_PER_HOUR, "HST" /*alias for Pacific/Honolulu*/); //---------------------------------------------------------- kSystemTimeZones[8] = - new SimpleTimeZone(-10*kMillisPerHour, "America/Adak" /*HA%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour, fgStatus); + new SimpleTimeZone(-10*U_MILLIS_PER_HOUR, "America/Adak" /*HA%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR, fgStatus); // Rule US 1967 max - Oct lastSun 2:00 0 S // Rule US 1987 max - Apr Sun>=1 2:00 1:00 D // America/Adak Alaska(US) -10:00 US HA%sT //---------------------------------------------------------- kSystemTimeZones[9] = - new SimpleTimeZone(-10*kMillisPerHour, "Pacific/Rarotonga" /*CK%sT*/, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::MARCH, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, (int32_t)(0.5*kMillisPerHour), fgStatus); + new SimpleTimeZone(-10*U_MILLIS_PER_HOUR, "Pacific/Rarotonga" /*CK%sT*/, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::MARCH, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, (int32_t)(0.5*U_MILLIS_PER_HOUR), fgStatus); // Rule Cook 1979 max - Mar Sun>=1 0:00 0 - // Rule Cook 1979 max - Oct lastSun 0:00 0:30 HS // Pacific/Rarotonga Cook Is(CK) -10:00 Cook CK%sT //---------------------------------------------------------- kSystemTimeZones[10] = - new SimpleTimeZone((int32_t)(-9.5*kMillisPerHour), "Pacific/Marquesas" /*MART*/); + new SimpleTimeZone((int32_t)(-9.5*U_MILLIS_PER_HOUR), "Pacific/Marquesas" /*MART*/); // Pacific/Marquesas French Polynesia(PF) -9:30 - MART # Marquesas Time //---------------------------------------------------------- kSystemTimeZones[11] = - new SimpleTimeZone(-9*kMillisPerHour, "Pacific/Gambier" /*GAMT*/); + new SimpleTimeZone(-9*U_MILLIS_PER_HOUR, "Pacific/Gambier" /*GAMT*/); // Pacific/Gambier French Polynesia(PF) -9:00 - GAMT # Gambier Time //---------------------------------------------------------- kSystemTimeZones[12] = - new SimpleTimeZone(-9*kMillisPerHour, "America/Anchorage" /*AK%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-9*U_MILLIS_PER_HOUR, "America/Anchorage" /*AK%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule US 1967 max - Oct lastSun 2:00 0 S // Rule US 1987 max - Apr Sun>=1 2:00 1:00 D // America/Anchorage Alaska(US) -9:00 US AK%sT kSystemTimeZones[13] = - new SimpleTimeZone(-9*kMillisPerHour, "AST" /*alias for America/Anchorage*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-9*U_MILLIS_PER_HOUR, "AST" /*alias for America/Anchorage*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[14] = - new SimpleTimeZone((int32_t)(-8.5*kMillisPerHour), "Pacific/Pitcairn" /*PNT*/); + new SimpleTimeZone((int32_t)(-8.5*U_MILLIS_PER_HOUR), "Pacific/Pitcairn" /*PNT*/); // Pacific/Pitcairn Pitcairn(PN) -8:30 - PNT # Pitcairn Time //---------------------------------------------------------- kSystemTimeZones[15] = - new SimpleTimeZone(-8*kMillisPerHour, "America/Vancouver" /*P%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-8*U_MILLIS_PER_HOUR, "America/Vancouver" /*P%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Vanc 1962 max - Oct lastSun 2:00 0 S // Rule Vanc 1987 max - Apr Sun>=1 2:00 1:00 D // America/Vancouver British Columbia(CA) -8:00 Vanc P%sT //---------------------------------------------------------- kSystemTimeZones[16] = - new SimpleTimeZone(-8*kMillisPerHour, "America/Tijuana" /*P%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-8*U_MILLIS_PER_HOUR, "America/Tijuana" /*P%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Mexico 1996 max - Apr Sun>=1 2:00 1:00 D // Rule Mexico 1996 max - Oct lastSun 2:00 0 S // America/Tijuana Mexico(MX) -8:00 Mexico P%sT //---------------------------------------------------------- kSystemTimeZones[17] = - new SimpleTimeZone(-8*kMillisPerHour, "America/Los_Angeles" /*P%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-8*U_MILLIS_PER_HOUR, "America/Los_Angeles" /*P%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule US 1967 max - Oct lastSun 2:00 0 S // Rule US 1987 max - Apr Sun>=1 2:00 1:00 D // America/Los_Angeles US Pacific time, represented by Los Angeles(US) -8:00 US P%sT kSystemTimeZones[18] = - new SimpleTimeZone(-8*kMillisPerHour, "PST" /*alias for America/Los_Angeles*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-8*U_MILLIS_PER_HOUR, "PST" /*alias for America/Los_Angeles*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[19] = - new SimpleTimeZone(-7*kMillisPerHour, "America/Dawson_Creek" /*MST*/); + new SimpleTimeZone(-7*U_MILLIS_PER_HOUR, "America/Dawson_Creek" /*MST*/); // America/Dawson_Creek British Columbia(CA) -7:00 - MST //---------------------------------------------------------- kSystemTimeZones[20] = - new SimpleTimeZone(-7*kMillisPerHour, "America/Phoenix" /*MST*/); + new SimpleTimeZone(-7*U_MILLIS_PER_HOUR, "America/Phoenix" /*MST*/); // America/Phoenix ?(US) -7:00 - MST kSystemTimeZones[21] = - new SimpleTimeZone(-7*kMillisPerHour, "America/Edmonton" /*M%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-7*U_MILLIS_PER_HOUR, "America/Edmonton" /*M%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Edm 1972 max - Oct lastSun 2:00 0 S // Rule Edm 1987 max - Apr Sun>=1 2:00 1:00 D // America/Edmonton Alberta(CA) -7:00 Edm M%sT //---------------------------------------------------------- kSystemTimeZones[22] = - new SimpleTimeZone(-7*kMillisPerHour, "America/Mazatlan" /*M%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-7*U_MILLIS_PER_HOUR, "America/Mazatlan" /*M%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Mexico 1996 max - Apr Sun>=1 2:00 1:00 D // Rule Mexico 1996 max - Oct lastSun 2:00 0 S // America/Mazatlan Mexico(MX) -7:00 Mexico M%sT //---------------------------------------------------------- kSystemTimeZones[23] = - new SimpleTimeZone(-7*kMillisPerHour, "America/Denver" /*M%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-7*U_MILLIS_PER_HOUR, "America/Denver" /*M%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule US 1967 max - Oct lastSun 2:00 0 S // Rule US 1987 max - Apr Sun>=1 2:00 1:00 D // America/Denver US Mountain time, represented by Denver(US) -7:00 US M%sT kSystemTimeZones[24] = - new SimpleTimeZone(-7*kMillisPerHour, "MST" /*alias for America/Denver*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-7*U_MILLIS_PER_HOUR, "MST" /*alias for America/Denver*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[25] = - new SimpleTimeZone(-6*kMillisPerHour, "America/Belize" /*C%sT*/); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/Belize" /*C%sT*/); // America/Belize Belize(BZ) -6:00 - C%sT //---------------------------------------------------------- kSystemTimeZones[26] = - new SimpleTimeZone(-6*kMillisPerHour, "America/Regina" /*CST*/); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/Regina" /*CST*/); // America/Regina Saskatchewan(CA) -6:00 - CST //---------------------------------------------------------- kSystemTimeZones[27] = - new SimpleTimeZone(-6*kMillisPerHour, "Pacific/Galapagos" /*GALT*/); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "Pacific/Galapagos" /*GALT*/); // Pacific/Galapagos Ecuador(EC) -6:00 - GALT # Galapagos Time //---------------------------------------------------------- kSystemTimeZones[28] = - new SimpleTimeZone(-6*kMillisPerHour, "America/Guatemala" /*C%sT*/); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/Guatemala" /*C%sT*/); // America/Guatemala Guatemala(GT) -6:00 - C%sT //---------------------------------------------------------- kSystemTimeZones[29] = - new SimpleTimeZone(-6*kMillisPerHour, "America/Tegucigalpa" /*C%sT*/); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/Tegucigalpa" /*C%sT*/); // America/Tegucigalpa Honduras(HN) -6:00 - C%sT //---------------------------------------------------------- kSystemTimeZones[30] = - new SimpleTimeZone(-6*kMillisPerHour, "America/El_Salvador" /*C%sT*/); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/El_Salvador" /*C%sT*/); // America/El_Salvador El Salvador(SV) -6:00 - C%sT //---------------------------------------------------------- kSystemTimeZones[31] = - new SimpleTimeZone(-6*kMillisPerHour, "America/Costa_Rica" /*C%sT*/); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/Costa_Rica" /*C%sT*/); // America/Costa_Rica Costa Rica(CR) -6:00 - C%sT //---------------------------------------------------------- kSystemTimeZones[32] = - new SimpleTimeZone(-6*kMillisPerHour, "America/Winnipeg" /*C%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/Winnipeg" /*C%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Winn 1966 max - Oct lastSun 2:00 0 S // Rule Winn 1987 max - Apr Sun>=1 2:00 1:00 D // America/Winnipeg Manitoba(CA) -6:00 Winn C%sT //---------------------------------------------------------- kSystemTimeZones[33] = - new SimpleTimeZone(-6*kMillisPerHour, "Pacific/Easter" /*EAS%sT*/, - Calendar::OCTOBER, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::MARCH, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "Pacific/Easter" /*EAS%sT*/, + Calendar::OCTOBER, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::MARCH, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Chile 1969 max - Oct Sun>=9 0:00 1:00 S // Rule Chile 1970 max - Mar Sun>=9 0:00 0 - // Pacific/Easter Chile(CL) -6:00 Chile EAS%sT //---------------------------------------------------------- kSystemTimeZones[34] = - new SimpleTimeZone(-6*kMillisPerHour, "America/Mexico_City" /*C%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/Mexico_City" /*C%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Mexico 1996 max - Apr Sun>=1 2:00 1:00 D // Rule Mexico 1996 max - Oct lastSun 2:00 0 S // America/Mexico_City Mexico(MX) -6:00 Mexico C%sT //---------------------------------------------------------- kSystemTimeZones[35] = - new SimpleTimeZone(-6*kMillisPerHour, "America/Chicago" /*C%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "America/Chicago" /*C%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule US 1967 max - Oct lastSun 2:00 0 S // Rule US 1987 max - Apr Sun>=1 2:00 1:00 D // America/Chicago US Central time, represented by Chicago(US) -6:00 US C%sT kSystemTimeZones[36] = - new SimpleTimeZone(-6*kMillisPerHour, "CST" /*alias for America/Chicago*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-6*U_MILLIS_PER_HOUR, "CST" /*alias for America/Chicago*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[37] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Porto_Acre" /*AST*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Porto_Acre" /*AST*/); // America/Porto_Acre Brazil(BR) -5:00 - AST //---------------------------------------------------------- kSystemTimeZones[38] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Bogota" /*CO%sT*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Bogota" /*CO%sT*/); // America/Bogota Colombia(CO) -5:00 - CO%sT # Colombia Time //---------------------------------------------------------- kSystemTimeZones[39] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Guayaquil" /*ECT*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Guayaquil" /*ECT*/); // America/Guayaquil Ecuador(EC) -5:00 - ECT # Ecuador Time //---------------------------------------------------------- kSystemTimeZones[40] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Jamaica" /*EST*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Jamaica" /*EST*/); // America/Jamaica Jamaica(JM) -5:00 - EST //---------------------------------------------------------- kSystemTimeZones[41] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Cayman" /*EST*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Cayman" /*EST*/); // America/Cayman Cayman Is(KY) -5:00 - EST //---------------------------------------------------------- kSystemTimeZones[42] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Managua" /*EST*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Managua" /*EST*/); // America/Managua Nicaragua(NI) -5:00 - EST //---------------------------------------------------------- kSystemTimeZones[43] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Panama" /*EST*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Panama" /*EST*/); // America/Panama Panama(PA) -5:00 - EST //---------------------------------------------------------- kSystemTimeZones[44] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Lima" /*PE%sT*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Lima" /*PE%sT*/); // America/Lima Peru(PE) -5:00 - PE%sT # Peru Time //---------------------------------------------------------- kSystemTimeZones[45] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Indianapolis" /*EST*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Indianapolis" /*EST*/); // America/Indianapolis Indiana(US) -5:00 - EST kSystemTimeZones[46] = - new SimpleTimeZone(-5*kMillisPerHour, "IET" /*alias for America/Indianapolis*/); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "IET" /*alias for America/Indianapolis*/); //---------------------------------------------------------- kSystemTimeZones[47] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Nassau" /*E%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Nassau" /*E%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Bahamas 1964 max - Oct lastSun 2:00 0 S // Rule Bahamas 1987 max - Apr Sun>=1 2:00 1:00 D // America/Nassau Bahamas(BS) -5:00 Bahamas E%sT //---------------------------------------------------------- kSystemTimeZones[48] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Montreal" /*E%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Montreal" /*E%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Mont 1957 max - Oct lastSun 2:00 0 S // Rule Mont 1987 max - Apr Sun>=1 2:00 1:00 D // America/Montreal Ontario, Quebec(CA) -5:00 Mont E%sT //---------------------------------------------------------- kSystemTimeZones[49] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Havana" /*C%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, 8, -Calendar::SUNDAY /*DOW>=DOM*/, 1*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Havana" /*C%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, 8, -Calendar::SUNDAY /*DOW>=DOM*/, 1*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Cuba 1990 max - Apr Sun>=1 0:00 1:00 D // Rule Cuba 1997 max - Oct Sun>=8 0:00s 0 S // America/Havana Cuba(CU) -5:00 Cuba C%sT //---------------------------------------------------------- kSystemTimeZones[50] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Port-au-Prince" /*E%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 1*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Port-au-Prince" /*E%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Haiti 1988 max - Apr Sun>=1 1:00s 1:00 D // Rule Haiti 1988 max - Oct lastSun 1:00s 0 S // America/Port-au-Prince Haiti(HT) -5:00 Haiti E%sT //---------------------------------------------------------- kSystemTimeZones[51] = - new SimpleTimeZone(-5*kMillisPerHour, "America/Grand_Turk" /*E%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/Grand_Turk" /*E%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule TC 1979 max - Oct lastSun 0:00 0 S // Rule TC 1987 max - Apr Sun>=1 0:00 1:00 D // America/Grand_Turk Turks and Caicos(TC) -5:00 TC E%sT //---------------------------------------------------------- kSystemTimeZones[52] = - new SimpleTimeZone(-5*kMillisPerHour, "America/New_York" /*E%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "America/New_York" /*E%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule US 1967 max - Oct lastSun 2:00 0 S // Rule US 1987 max - Apr Sun>=1 2:00 1:00 D // America/New_York US Eastern time, represented by New York(US) -5:00 US E%sT kSystemTimeZones[53] = - new SimpleTimeZone(-5*kMillisPerHour, "EST" /*alias for America/New_York*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-5*U_MILLIS_PER_HOUR, "EST" /*alias for America/New_York*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[54] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Antigua" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Antigua" /*AST*/); // America/Antigua Antigua and Barbuda(AG) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[55] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Anguilla" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Anguilla" /*AST*/); // America/Anguilla Anguilla(AI) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[56] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Curacao" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Curacao" /*AST*/); // America/Curacao Curacao(AN) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[57] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Aruba" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Aruba" /*AST*/); // America/Aruba Aruba(AW) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[58] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Barbados" /*A%sT*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Barbados" /*A%sT*/); // America/Barbados Barbados(BB) -4:00 - A%sT //---------------------------------------------------------- kSystemTimeZones[59] = - new SimpleTimeZone(-4*kMillisPerHour, "America/La_Paz" /*BOT*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/La_Paz" /*BOT*/); // America/La_Paz Bolivia(BO) -4:00 - BOT # Bolivia Time //---------------------------------------------------------- kSystemTimeZones[60] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Manaus" /*WST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Manaus" /*WST*/); // America/Manaus Brazil(BR) -4:00 - WST //---------------------------------------------------------- kSystemTimeZones[61] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Dominica" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Dominica" /*AST*/); // America/Dominica Dominica(DM) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[62] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Santo_Domingo" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Santo_Domingo" /*AST*/); // America/Santo_Domingo Dominican Republic(DO) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[63] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Grenada" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Grenada" /*AST*/); // America/Grenada Grenada(GD) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[64] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Guadeloupe" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Guadeloupe" /*AST*/); // America/Guadeloupe Guadeloupe(GP) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[65] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Guyana" /*GYT*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Guyana" /*GYT*/); // America/Guyana Guyana(GY) -4:00 - GYT //---------------------------------------------------------- kSystemTimeZones[66] = - new SimpleTimeZone(-4*kMillisPerHour, "America/St_Kitts" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/St_Kitts" /*AST*/); // America/St_Kitts St Kitts-Nevis(KN) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[67] = - new SimpleTimeZone(-4*kMillisPerHour, "America/St_Lucia" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/St_Lucia" /*AST*/); // America/St_Lucia St Lucia(LC) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[68] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Martinique" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Martinique" /*AST*/); // America/Martinique Martinique(MQ) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[69] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Montserrat" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Montserrat" /*AST*/); // America/Montserrat Montserrat(MS) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[70] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Puerto_Rico" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Puerto_Rico" /*AST*/); // America/Puerto_Rico Puerto Rico(PR) -4:00 - AST kSystemTimeZones[71] = - new SimpleTimeZone(-4*kMillisPerHour, "PRT" /*alias for America/Puerto_Rico*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "PRT" /*alias for America/Puerto_Rico*/); //---------------------------------------------------------- kSystemTimeZones[72] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Port_of_Spain" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Port_of_Spain" /*AST*/); // America/Port_of_Spain Trinidad and Tobago(TT) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[73] = - new SimpleTimeZone(-4*kMillisPerHour, "America/St_Vincent" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/St_Vincent" /*AST*/); // America/St_Vincent St Vincent and the Grenadines(VC) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[74] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Tortola" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Tortola" /*AST*/); // America/Tortola British Virgin Is(VG) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[75] = - new SimpleTimeZone(-4*kMillisPerHour, "America/St_Thomas" /*AST*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/St_Thomas" /*AST*/); // America/St_Thomas Virgin Is(VI) -4:00 - AST //---------------------------------------------------------- kSystemTimeZones[76] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Caracas" /*VET*/); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Caracas" /*VET*/); // America/Caracas Venezuela(VE) -4:00 - VET //---------------------------------------------------------- kSystemTimeZones[77] = - new SimpleTimeZone(-4*kMillisPerHour, "Antarctica/Palmer" /*CL%sT*/, - Calendar::OCTOBER, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::MARCH, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "Antarctica/Palmer" /*CL%sT*/, + Calendar::OCTOBER, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::MARCH, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule ChileAQ 1969 max - Oct Sun>=9 0:00 1:00 S // Rule ChileAQ 1970 max - Mar Sun>=9 0:00 0 - // Antarctica/Palmer USA - year-round bases(AQ) -4:00 ChileAQ CL%sT //---------------------------------------------------------- kSystemTimeZones[78] = - new SimpleTimeZone(-4*kMillisPerHour, "Atlantic/Bermuda" /*A%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "Atlantic/Bermuda" /*A%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Bahamas 1964 max - Oct lastSun 2:00 0 S // Rule Bahamas 1987 max - Apr Sun>=1 2:00 1:00 D // Atlantic/Bermuda Bermuda(BM) -4:00 Bahamas A%sT //---------------------------------------------------------- kSystemTimeZones[79] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Cuiaba" /*W%sT*/, - Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::FEBRUARY, 11, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Cuiaba" /*W%sT*/, + Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::FEBRUARY, 11, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Brazil 1998 max - Oct Sun>=1 0:00 1:00 D // Rule Brazil 1999 max - Feb Sun>=11 0:00 0 S // America/Cuiaba Brazil(BR) -4:00 Brazil W%sT //---------------------------------------------------------- kSystemTimeZones[80] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Halifax" /*A%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Halifax" /*A%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Halifax 1962 max - Oct lastSun 2:00 0 S // Rule Halifax 1987 max - Apr Sun>=1 2:00 1:00 D // America/Halifax ?(CA) -4:00 Halifax A%sT //---------------------------------------------------------- kSystemTimeZones[81] = - new SimpleTimeZone(-4*kMillisPerHour, "Atlantic/Stanley" /*FK%sT*/, - Calendar::SEPTEMBER, 8, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::APRIL, 16, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "Atlantic/Stanley" /*FK%sT*/, + Calendar::SEPTEMBER, 8, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::APRIL, 16, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Falk 1986 max - Apr Sun>=16 0:00 0 - // Rule Falk 1996 max - Sep Sun>=8 0:00 1:00 S // Atlantic/Stanley Falklands(FK) -4:00 Falk FK%sT //---------------------------------------------------------- kSystemTimeZones[82] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Thule" /*A%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Thule" /*A%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Thule 1993 max - Apr Sun>=1 2:00 1:00 D // Rule Thule 1993 max - Oct lastSun 2:00 0 S // America/Thule ?(GL) -4:00 Thule A%sT //---------------------------------------------------------- kSystemTimeZones[83] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Asuncion" /*PY%sT*/, - Calendar::OCTOBER, 1, 0 /*DOM*/, 0*kMillisPerHour, - Calendar::MARCH, 1, 0 /*DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Asuncion" /*PY%sT*/, + Calendar::OCTOBER, 1, 0 /*DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::MARCH, 1, 0 /*DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Para 1996 max - Mar 1 0:00 0 - // Rule Para 1997 max - Oct 1 0:00 1:00 S // America/Asuncion Paraguay(PY) -4:00 Para PY%sT //---------------------------------------------------------- kSystemTimeZones[84] = - new SimpleTimeZone(-4*kMillisPerHour, "America/Santiago" /*CL%sT*/, - Calendar::OCTOBER, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::MARCH, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-4*U_MILLIS_PER_HOUR, "America/Santiago" /*CL%sT*/, + Calendar::OCTOBER, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::MARCH, 9, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Chile 1969 max - Oct Sun>=9 0:00 1:00 S // Rule Chile 1970 max - Mar Sun>=9 0:00 0 - // America/Santiago Chile(CL) -4:00 Chile CL%sT //---------------------------------------------------------- kSystemTimeZones[85] = - new SimpleTimeZone((int32_t)(-3.5*kMillisPerHour), "America/St_Johns" /*N%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone((int32_t)(-3.5*U_MILLIS_PER_HOUR), "America/St_Johns" /*N%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule StJohns 1960 max - Oct lastSun 2:00 0 S // Rule StJohns 1989 max - Apr Sun>=1 2:00 1:00 D // America/St_Johns Canada(CA) -3:30 StJohns N%sT kSystemTimeZones[86] = - new SimpleTimeZone(-3*kMillisPerHour, "America/Fortaleza" /*EST*/); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "America/Fortaleza" /*EST*/); // America/Fortaleza Brazil(BR) -3:00 - EST //---------------------------------------------------------- kSystemTimeZones[87] = - new SimpleTimeZone(-3*kMillisPerHour, "America/Cayenne" /*GFT*/); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "America/Cayenne" /*GFT*/); // America/Cayenne French Guiana(GF) -3:00 - GFT //---------------------------------------------------------- kSystemTimeZones[88] = - new SimpleTimeZone(-3*kMillisPerHour, "America/Paramaribo" /*SRT*/); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "America/Paramaribo" /*SRT*/); // America/Paramaribo Suriname(SR) -3:00 - SRT //---------------------------------------------------------- kSystemTimeZones[89] = - new SimpleTimeZone(-3*kMillisPerHour, "America/Montevideo" /*UY%sT*/); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "America/Montevideo" /*UY%sT*/); // America/Montevideo Uruguay(UY) -3:00 - UY%sT //---------------------------------------------------------- kSystemTimeZones[90] = - new SimpleTimeZone(-3*kMillisPerHour, "America/Buenos_Aires" /*AR%sT*/); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "America/Buenos_Aires" /*AR%sT*/); // America/Buenos_Aires Argentina(AR) -3:00 - AR%sT kSystemTimeZones[91] = - new SimpleTimeZone(-3*kMillisPerHour, "AGT" /*alias for America/Buenos_Aires*/); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "AGT" /*alias for America/Buenos_Aires*/); //---------------------------------------------------------- kSystemTimeZones[92] = - new SimpleTimeZone(-3*kMillisPerHour, "America/Godthab" /*WG%sT*/, - Calendar::MARCH, -1, Calendar::SATURDAY /*DOW_IN_DOM*/, 22*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SATURDAY /*DOW_IN_DOM*/, 22*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "America/Godthab" /*WG%sT*/, + Calendar::MARCH, -1, Calendar::SATURDAY /*DOW_IN_DOM*/, 22*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SATURDAY /*DOW_IN_DOM*/, 22*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // America/Godthab ?(GL) -3:00 EU WG%sT //---------------------------------------------------------- kSystemTimeZones[93] = - new SimpleTimeZone(-3*kMillisPerHour, "America/Miquelon" /*PM%sT*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "America/Miquelon" /*PM%sT*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Mont 1957 max - Oct lastSun 2:00 0 S // Rule Mont 1987 max - Apr Sun>=1 2:00 1:00 D // America/Miquelon St Pierre and Miquelon(PM) -3:00 Mont PM%sT # Pierre & Miquelon Time //---------------------------------------------------------- kSystemTimeZones[94] = - new SimpleTimeZone(-3*kMillisPerHour, "America/Sao_Paulo" /*E%sT*/, - Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::FEBRUARY, 11, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "America/Sao_Paulo" /*E%sT*/, + Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::FEBRUARY, 11, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Brazil 1998 max - Oct Sun>=1 0:00 1:00 D // Rule Brazil 1999 max - Feb Sun>=11 0:00 0 S // America/Sao_Paulo Brazil(BR) -3:00 Brazil E%sT kSystemTimeZones[95] = - new SimpleTimeZone(-3*kMillisPerHour, "BET" /*alias for America/Sao_Paulo*/, - Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::FEBRUARY, 11, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-3*U_MILLIS_PER_HOUR, "BET" /*alias for America/Sao_Paulo*/, + Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::FEBRUARY, 11, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[96] = - new SimpleTimeZone(-2*kMillisPerHour, "America/Noronha" /*FST*/); + new SimpleTimeZone(-2*U_MILLIS_PER_HOUR, "America/Noronha" /*FST*/); // America/Noronha Brazil(BR) -2:00 - FST //---------------------------------------------------------- kSystemTimeZones[97] = - new SimpleTimeZone(-2*kMillisPerHour, "Atlantic/South_Georgia" /*GST*/); + new SimpleTimeZone(-2*U_MILLIS_PER_HOUR, "Atlantic/South_Georgia" /*GST*/); // Atlantic/South_Georgia South Georgia(GS) -2:00 - GST # South Georgia Time //---------------------------------------------------------- kSystemTimeZones[98] = - new SimpleTimeZone(-1*kMillisPerHour, "Atlantic/Jan_Mayen" /*EGT*/); + new SimpleTimeZone(-1*U_MILLIS_PER_HOUR, "Atlantic/Jan_Mayen" /*EGT*/); // Atlantic/Jan_Mayen ?(NO) -1:00 - EGT //---------------------------------------------------------- kSystemTimeZones[99] = - new SimpleTimeZone(-1*kMillisPerHour, "Atlantic/Cape_Verde" /*CVT*/); + new SimpleTimeZone(-1*U_MILLIS_PER_HOUR, "Atlantic/Cape_Verde" /*CVT*/); // Atlantic/Cape_Verde Cape Verde(CV) -1:00 - CVT //---------------------------------------------------------- kSystemTimeZones[100] = - new SimpleTimeZone(-1*kMillisPerHour, "America/Scoresbysund" /*EG%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-1*U_MILLIS_PER_HOUR, "America/Scoresbysund" /*EG%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // America/Scoresbysund ?(GL) -1:00 EU EG%sT //---------------------------------------------------------- kSystemTimeZones[101] = - new SimpleTimeZone(-1*kMillisPerHour, "Atlantic/Azores" /*AZO%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(-1*U_MILLIS_PER_HOUR, "Atlantic/Azores" /*AZO%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Atlantic/Azores Portugal(PT) -1:00 EU AZO%sT //---------------------------------------------------------- kSystemTimeZones[102] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Ouagadougou" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Ouagadougou" /*GMT*/); // Africa/Ouagadougou Burkina Faso(BF) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[103] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Abidjan" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Abidjan" /*GMT*/); // Africa/Abidjan Cote D'Ivoire(CI) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[104] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Accra" /*%s*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Accra" /*%s*/); // Africa/Accra Ghana(GH) 0:00 - %s //---------------------------------------------------------- kSystemTimeZones[105] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Banjul" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Banjul" /*GMT*/); // Africa/Banjul Gambia(GM) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[106] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Conakry" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Conakry" /*GMT*/); // Africa/Conakry Guinea(GN) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[107] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Bissau" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Bissau" /*GMT*/); // Africa/Bissau Guinea-Bissau(GW) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[108] = - new SimpleTimeZone(0*kMillisPerHour, "Atlantic/Reykjavik" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Atlantic/Reykjavik" /*GMT*/); // Atlantic/Reykjavik Iceland(IS) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[109] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Monrovia" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Monrovia" /*GMT*/); // Africa/Monrovia Liberia(LR) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[110] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Casablanca" /*WET*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Casablanca" /*WET*/); // Africa/Casablanca Morocco(MA) 0:00 - WET //---------------------------------------------------------- kSystemTimeZones[111] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Timbuktu" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Timbuktu" /*GMT*/); // Africa/Timbuktu Mali(ML) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[112] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Nouakchott" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Nouakchott" /*GMT*/); // Africa/Nouakchott Mauritania(MR) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[113] = - new SimpleTimeZone(0*kMillisPerHour, "Atlantic/St_Helena" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Atlantic/St_Helena" /*GMT*/); // Atlantic/St_Helena St Helena(SH) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[114] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Freetown" /*%s*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Freetown" /*%s*/); // Africa/Freetown Sierra Leone(SL) 0:00 - %s //---------------------------------------------------------- kSystemTimeZones[115] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Dakar" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Dakar" /*GMT*/); // Africa/Dakar Senegal(SN) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[116] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Sao_Tome" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Sao_Tome" /*GMT*/); // Africa/Sao_Tome Sao Tome and Principe(ST) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[117] = - new SimpleTimeZone(0*kMillisPerHour, "Africa/Lome" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Africa/Lome" /*GMT*/); // Africa/Lome Togo(TG) 0:00 - GMT //---------------------------------------------------------- kSystemTimeZones[118] = - new SimpleTimeZone(0*kMillisPerHour, "GMT" /*GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "GMT" /*GMT*/); // GMT -(-) 0:00 - GMT kSystemTimeZones[119] = - new SimpleTimeZone(0*kMillisPerHour, "UTC" /*alias for GMT*/); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "UTC" /*alias for GMT*/); //---------------------------------------------------------- kSystemTimeZones[120] = - new SimpleTimeZone(0*kMillisPerHour, "Atlantic/Faeroe" /*WE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Atlantic/Faeroe" /*WE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Atlantic/Faeroe Denmark, Faeroe Islands, and Greenland(DK) 0:00 EU WE%sT //---------------------------------------------------------- kSystemTimeZones[121] = - new SimpleTimeZone(0*kMillisPerHour, "Atlantic/Canary" /*WE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Atlantic/Canary" /*WE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Atlantic/Canary Spain(ES) 0:00 EU WE%sT //---------------------------------------------------------- kSystemTimeZones[122] = - new SimpleTimeZone(0*kMillisPerHour, "Europe/Dublin" /*GMT/IST*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Europe/Dublin" /*GMT/IST*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Dublin ---(IE) 0:00 EU GMT/IST //---------------------------------------------------------- kSystemTimeZones[123] = - new SimpleTimeZone(0*kMillisPerHour, "Europe/Lisbon" /*WE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Europe/Lisbon" /*WE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Lisbon Portugal(PT) 0:00 EU WE%sT //---------------------------------------------------------- kSystemTimeZones[124] = - new SimpleTimeZone(0*kMillisPerHour, "Europe/London" /*GMT/BST*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(0*U_MILLIS_PER_HOUR, "Europe/London" /*GMT/BST*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/London ---(GB) 0:00 EU GMT/BST //---------------------------------------------------------- kSystemTimeZones[125] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Luanda" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Luanda" /*WAT*/); // Africa/Luanda Angola(AO) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[126] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Porto-Novo" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Porto-Novo" /*WAT*/); // Africa/Porto-Novo Benin(BJ) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[127] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Bangui" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Bangui" /*WAT*/); // Africa/Bangui Central African Republic(CF) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[128] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Kinshasa" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Kinshasa" /*WAT*/); // Africa/Kinshasa Democratic Republic of Congo(CG) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[129] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Douala" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Douala" /*WAT*/); // Africa/Douala Cameroon(CM) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[130] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Libreville" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Libreville" /*WAT*/); // Africa/Libreville Gabon(GA) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[131] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Malabo" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Malabo" /*WAT*/); // Africa/Malabo Equatorial Guinea(GQ) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[132] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Niamey" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Niamey" /*WAT*/); // Africa/Niamey Niger(NE) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[133] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Lagos" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Lagos" /*WAT*/); // Africa/Lagos Nigeria(NG) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[134] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Ndjamena" /*WAT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Ndjamena" /*WAT*/); // Africa/Ndjamena Chad(TD) 1:00 - WAT //---------------------------------------------------------- kSystemTimeZones[135] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Tunis" /*CE%sT*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Tunis" /*CE%sT*/); // Africa/Tunis Tunisia(TN) 1:00 - CE%sT //---------------------------------------------------------- kSystemTimeZones[136] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Algiers" /*CET*/); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Algiers" /*CET*/); // Africa/Algiers Algeria(DZ) 1:00 - CET //---------------------------------------------------------- kSystemTimeZones[137] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Andorra" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Andorra" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Andorra Andorra(AD) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[138] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Tirane" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Tirane" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Tirane Albania(AL) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[139] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Vienna" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Vienna" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Vienna Austria(AT) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[140] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Brussels" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Brussels" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Brussels Belgium(BE) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[141] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Zurich" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Zurich" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Zurich Switzerland(CH) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[142] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Prague" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Prague" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Prague Czech Republic(CZ) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[143] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Berlin" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Berlin" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Berlin Germany(DE) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[144] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Copenhagen" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Copenhagen" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Copenhagen Denmark, Faeroe Islands, and Greenland(DK) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[145] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Madrid" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Madrid" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Madrid Spain(ES) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[146] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Gibraltar" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Gibraltar" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Gibraltar Gibraltar(GI) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[147] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Budapest" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Budapest" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Budapest Hungary(HU) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[148] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Rome" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Rome" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Rome Italy(IT) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[149] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Vaduz" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Vaduz" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Vaduz Liechtenstein(LI) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[150] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Luxembourg" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Luxembourg" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Luxembourg Luxembourg(LU) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[151] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Tripoli" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::THURSDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, 1, -Calendar::THURSDAY /*DOW>=DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Tripoli" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::THURSDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, 1, -Calendar::THURSDAY /*DOW>=DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Libya 1997 max - Mar lastThu 2:00s 1:00 S // Rule Libya 1997 max - Oct Thu>=1 2:00s 0 - // Africa/Tripoli Libya(LY) 1:00 Libya CE%sT //---------------------------------------------------------- kSystemTimeZones[152] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Monaco" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Monaco" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Monaco Monaco(MC) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[153] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Malta" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Malta" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Malta Malta(MT) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[154] = - new SimpleTimeZone(1*kMillisPerHour, "Africa/Windhoek" /*WA%sT*/, - Calendar::SEPTEMBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Africa/Windhoek" /*WA%sT*/, + Calendar::SEPTEMBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S // Rule Namibia 1995 max - Apr Sun>=1 2:00 0 - // Africa/Windhoek Namibia(NA) 1:00 Namibia WA%sT //---------------------------------------------------------- kSystemTimeZones[155] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Amsterdam" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Amsterdam" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Amsterdam Netherlands(NL) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[156] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Oslo" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Oslo" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Oslo Norway(NO) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[157] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Warsaw" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Warsaw" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule W-Eur 1981 max - Mar lastSun 1:00s 1:00 S // Rule W-Eur 1996 max - Oct lastSun 1:00s 0 - // Europe/Warsaw Poland(PL) 1:00 W-Eur CE%sT //---------------------------------------------------------- kSystemTimeZones[158] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Stockholm" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Stockholm" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Stockholm Sweden(SE) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[159] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Belgrade" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Belgrade" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Belgrade Yugoslavia(YU) 1:00 EU CE%sT //---------------------------------------------------------- kSystemTimeZones[160] = - new SimpleTimeZone(1*kMillisPerHour, "Europe/Paris" /*CE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "Europe/Paris" /*CE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Paris France(FR) 1:00 EU CE%sT kSystemTimeZones[161] = - new SimpleTimeZone(1*kMillisPerHour, "ECT" /*alias for Europe/Paris*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(1*U_MILLIS_PER_HOUR, "ECT" /*alias for Europe/Paris*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[162] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Bujumbura" /*CAT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Bujumbura" /*CAT*/); // Africa/Bujumbura Burundi(BI) 2:00 - CAT //---------------------------------------------------------- kSystemTimeZones[163] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Gaborone" /*CAT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Gaborone" /*CAT*/); // Africa/Gaborone Botswana(BW) 2:00 - CAT //---------------------------------------------------------- kSystemTimeZones[164] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Lubumbashi" /*CAT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Lubumbashi" /*CAT*/); // Africa/Lubumbashi Democratic Republic of Congo(CG) 2:00 - CAT //---------------------------------------------------------- kSystemTimeZones[165] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Maseru" /*SAST*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Maseru" /*SAST*/); // Africa/Maseru Lesotho(LS) 2:00 - SAST //---------------------------------------------------------- kSystemTimeZones[166] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Blantyre" /*CAT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Blantyre" /*CAT*/); // Africa/Blantyre Malawi(ML) 2:00 - CAT //---------------------------------------------------------- kSystemTimeZones[167] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Maputo" /*CAT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Maputo" /*CAT*/); // Africa/Maputo Mozambique(MZ) 2:00 - CAT //---------------------------------------------------------- kSystemTimeZones[168] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Kigali" /*CAT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Kigali" /*CAT*/); // Africa/Kigali Rwanda(RW) 2:00 - CAT //---------------------------------------------------------- kSystemTimeZones[169] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Khartoum" /*CA%sT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Khartoum" /*CA%sT*/); // Africa/Khartoum Sudan(SD) 2:00 - CA%sT //---------------------------------------------------------- kSystemTimeZones[170] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Mbabane" /*SAST*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Mbabane" /*SAST*/); // Africa/Mbabane Swaziland(SZ) 2:00 - SAST //---------------------------------------------------------- kSystemTimeZones[171] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Lusaka" /*CAT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Lusaka" /*CAT*/); // Africa/Lusaka Zambia(ZM) 2:00 - CAT //---------------------------------------------------------- kSystemTimeZones[172] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Harare" /*CAT*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Harare" /*CAT*/); // Africa/Harare Zimbabwe(ZW) 2:00 - CAT kSystemTimeZones[173] = - new SimpleTimeZone(2*kMillisPerHour, "CAT" /*alias for Africa/Harare*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "CAT" /*alias for Africa/Harare*/); //---------------------------------------------------------- kSystemTimeZones[174] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Johannesburg" /*SAST*/); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Johannesburg" /*SAST*/); // Africa/Johannesburg South Africa(ZA) 2:00 - SAST //---------------------------------------------------------- kSystemTimeZones[175] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Sofia" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Sofia" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule E-Eur 1981 max - Mar lastSun 0:00 1:00 S // Rule E-Eur 1996 max - Oct lastSun 0:00 0 - // Europe/Sofia Bulgaria(BG) 2:00 E-Eur EE%sT //---------------------------------------------------------- kSystemTimeZones[176] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Minsk" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Minsk" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Europe/Minsk Belarus(BY) 2:00 Russia EE%sT //---------------------------------------------------------- kSystemTimeZones[177] = - new SimpleTimeZone(2*kMillisPerHour, "Asia/Nicosia" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Asia/Nicosia" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Cyprus 1979 max - Sep lastSun 0:00 0 - // Rule Cyprus 1981 max - Mar lastSun 0:00 1:00 S // Asia/Nicosia Cyprus(CY) 2:00 Cyprus EE%sT //---------------------------------------------------------- kSystemTimeZones[178] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Tallinn" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Tallinn" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule C-Eur 1981 max - Mar lastSun 2:00s 1:00 S // Rule C-Eur 1996 max - Oct lastSun 2:00s 0 - // Europe/Tallinn Estonia(EE) 2:00 C-Eur EE%sT //---------------------------------------------------------- kSystemTimeZones[179] = - new SimpleTimeZone(2*kMillisPerHour, "Africa/Cairo" /*EE%sT*/, - Calendar::APRIL, -1, Calendar::FRIDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, - Calendar::SEPTEMBER, -1, Calendar::FRIDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Africa/Cairo" /*EE%sT*/, + Calendar::APRIL, -1, Calendar::FRIDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, -1, Calendar::FRIDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Egypt 1995 max - Apr lastFri 1:00 1:00 S // Rule Egypt 1995 max - Sep lastFri 3:00 0 - // Africa/Cairo Egypt(EG) 2:00 Egypt EE%sT kSystemTimeZones[180] = - new SimpleTimeZone(2*kMillisPerHour, "ART" /*alias for Africa/Cairo*/, - Calendar::APRIL, -1, Calendar::FRIDAY /*DOW_IN_DOM*/, 1*kMillisPerHour, - Calendar::SEPTEMBER, -1, Calendar::FRIDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "ART" /*alias for Africa/Cairo*/, + Calendar::APRIL, -1, Calendar::FRIDAY /*DOW_IN_DOM*/, 1*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, -1, Calendar::FRIDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[181] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Helsinki" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Helsinki" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Helsinki Finland(FI) 2:00 EU EE%sT //---------------------------------------------------------- kSystemTimeZones[182] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Athens" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Athens" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Athens Greece(GR) 2:00 EU EE%sT //---------------------------------------------------------- kSystemTimeZones[183] = - new SimpleTimeZone(2*kMillisPerHour, "Asia/Jerusalem" /*I%sT*/, - Calendar::MARCH, 15, -Calendar::FRIDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::SEPTEMBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Asia/Jerusalem" /*I%sT*/, + Calendar::MARCH, 15, -Calendar::FRIDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Zion 1999 max - Mar Fri>=15 0:00 1:00 D // Rule Zion 1999 max - Sep Sun>=1 0:00 0 S // Asia/Jerusalem Israel(IL) 2:00 Zion I%sT //---------------------------------------------------------- kSystemTimeZones[184] = - new SimpleTimeZone(2*kMillisPerHour, "Asia/Amman" /*EE%sT*/, - Calendar::APRIL, 1, -Calendar::FRIDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::SEPTEMBER, 15, -Calendar::FRIDAY /*DOW>=DOM*/, 1*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Asia/Amman" /*EE%sT*/, + Calendar::APRIL, 1, -Calendar::FRIDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, 15, -Calendar::FRIDAY /*DOW>=DOM*/, 1*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Jordan 1993 max - Apr Fri>=1 0:00 1:00 S // Rule Jordan 1995 max - Sep Fri>=15 0:00s 0 - // Asia/Amman Jordan(JO) 2:00 Jordan EE%sT //---------------------------------------------------------- kSystemTimeZones[185] = - new SimpleTimeZone(2*kMillisPerHour, "Asia/Beirut" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Asia/Beirut" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S // Rule Lebanon 1993 max - Sep lastSun 0:00 0 - // Asia/Beirut Lebanon(LB) 2:00 Lebanon EE%sT //---------------------------------------------------------- kSystemTimeZones[186] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Vilnius" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Vilnius" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule C-Eur 1981 max - Mar lastSun 2:00s 1:00 S // Rule C-Eur 1996 max - Oct lastSun 2:00s 0 - // Europe/Vilnius Lithuania(LT) 2:00 C-Eur EE%sT //---------------------------------------------------------- kSystemTimeZones[187] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Riga" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Riga" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Latvia 1992 max - Mar lastSun 2:00s 1:00 S // Rule Latvia 1992 max - Sep lastSun 2:00s 0 - // Europe/Riga Latvia(LV) 2:00 Latvia EE%sT //---------------------------------------------------------- kSystemTimeZones[188] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Chisinau" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Chisinau" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule E-Eur 1981 max - Mar lastSun 0:00 1:00 S // Rule E-Eur 1996 max - Oct lastSun 0:00 0 - // Europe/Chisinau Moldova(MD) 2:00 E-Eur EE%sT //---------------------------------------------------------- kSystemTimeZones[189] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Bucharest" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Bucharest" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule E-Eur 1981 max - Mar lastSun 0:00 1:00 S // Rule E-Eur 1996 max - Oct lastSun 0:00 0 - // Europe/Bucharest Romania(RO) 2:00 E-Eur EE%sT //---------------------------------------------------------- kSystemTimeZones[190] = - new SimpleTimeZone(2*kMillisPerHour, "Asia/Damascus" /*EE%sT*/, - Calendar::APRIL, 1, 0 /*DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, 1, 0 /*DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Asia/Damascus" /*EE%sT*/, + Calendar::APRIL, 1, 0 /*DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, 1, 0 /*DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Syria 1994 max - Apr 1 0:00 1:00 S // Rule Syria 1994 max - Oct 1 0:00 0 - // Asia/Damascus Syria(SY) 2:00 Syria EE%sT //---------------------------------------------------------- kSystemTimeZones[191] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Kiev" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Kiev" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Kiev Ukraine(UA) 2:00 EU EE%sT //---------------------------------------------------------- kSystemTimeZones[192] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Istanbul" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Istanbul" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EU 1981 max - Mar lastSun 1:00u 1:00 S // Rule EU 1996 max - Oct lastSun 1:00u 0 - // Europe/Istanbul Turkey(TR) 2:00 EU EE%sT kSystemTimeZones[193] = - new SimpleTimeZone(2*kMillisPerHour, "EET" /*alias for Europe/Istanbul*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "EET" /*alias for Europe/Istanbul*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[194] = - new SimpleTimeZone(3*kMillisPerHour, "Asia/Bahrain" /*AST*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Asia/Bahrain" /*AST*/); // Asia/Bahrain Bahrain(BH) 3:00 - AST //---------------------------------------------------------- kSystemTimeZones[195] = - new SimpleTimeZone(3*kMillisPerHour, "Africa/Djibouti" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Africa/Djibouti" /*EAT*/); // Africa/Djibouti Djibouti(DJ) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[196] = - new SimpleTimeZone(3*kMillisPerHour, "Africa/Asmera" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Africa/Asmera" /*EAT*/); // Africa/Asmera Eritrea(ER) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[197] = - new SimpleTimeZone(3*kMillisPerHour, "Africa/Addis_Ababa" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Africa/Addis_Ababa" /*EAT*/); // Africa/Addis_Ababa Ethiopia(ET) 3:00 - EAT kSystemTimeZones[198] = - new SimpleTimeZone(3*kMillisPerHour, "EAT" /*alias for Africa/Addis_Ababa*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "EAT" /*alias for Africa/Addis_Ababa*/); //---------------------------------------------------------- kSystemTimeZones[199] = - new SimpleTimeZone(3*kMillisPerHour, "Africa/Nairobi" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Africa/Nairobi" /*EAT*/); // Africa/Nairobi Kenya(KE) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[200] = - new SimpleTimeZone(3*kMillisPerHour, "Indian/Comoro" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Indian/Comoro" /*EAT*/); // Indian/Comoro Comoros(KM) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[201] = - new SimpleTimeZone(3*kMillisPerHour, "Asia/Kuwait" /*AST*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Asia/Kuwait" /*AST*/); // Asia/Kuwait Kuwait(KW) 3:00 - AST //---------------------------------------------------------- kSystemTimeZones[202] = - new SimpleTimeZone(3*kMillisPerHour, "Indian/Antananarivo" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Indian/Antananarivo" /*EAT*/); // Indian/Antananarivo Madagascar(MK) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[203] = - new SimpleTimeZone(3*kMillisPerHour, "Asia/Qatar" /*AST*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Asia/Qatar" /*AST*/); // Asia/Qatar Qatar(QA) 3:00 - AST //---------------------------------------------------------- kSystemTimeZones[204] = - new SimpleTimeZone(3*kMillisPerHour, "Africa/Mogadishu" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Africa/Mogadishu" /*EAT*/); // Africa/Mogadishu Somalia(SO) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[205] = - new SimpleTimeZone(3*kMillisPerHour, "Africa/Dar_es_Salaam" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Africa/Dar_es_Salaam" /*EAT*/); // Africa/Dar_es_Salaam Tanzania(TZ) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[206] = - new SimpleTimeZone(3*kMillisPerHour, "Africa/Kampala" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Africa/Kampala" /*EAT*/); // Africa/Kampala Uganda(UG) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[207] = - new SimpleTimeZone(3*kMillisPerHour, "Asia/Aden" /*AST*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Asia/Aden" /*AST*/); // Asia/Aden Yemen(YE) 3:00 - AST //---------------------------------------------------------- kSystemTimeZones[208] = - new SimpleTimeZone(3*kMillisPerHour, "Indian/Mayotte" /*EAT*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Indian/Mayotte" /*EAT*/); // Indian/Mayotte Mayotte(YT) 3:00 - EAT //---------------------------------------------------------- kSystemTimeZones[209] = - new SimpleTimeZone(3*kMillisPerHour, "Asia/Riyadh" /*AST*/); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Asia/Riyadh" /*AST*/); // Asia/Riyadh Saudi Arabia(SA) 3:00 - AST //---------------------------------------------------------- kSystemTimeZones[210] = - new SimpleTimeZone(3*kMillisPerHour, "Asia/Baghdad" /*A%sT*/, - Calendar::APRIL, 1, 0 /*DOM*/, 3*kMillisPerHour, - Calendar::OCTOBER, 1, 0 /*DOM*/, 4*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Asia/Baghdad" /*A%sT*/, + Calendar::APRIL, 1, 0 /*DOM*/, 3*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, 1, 0 /*DOM*/, 4*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Iraq 1991 max - Apr 1 3:00s 1:00 D // Rule Iraq 1991 max - Oct 1 3:00s 0 D // Asia/Baghdad Iraq(IQ) 3:00 Iraq A%sT //---------------------------------------------------------- kSystemTimeZones[211] = - new SimpleTimeZone(3*kMillisPerHour, "Europe/Simferopol" /*MSK/MSD*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Europe/Simferopol" /*MSK/MSD*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Crimea 1996 max - Mar lastSun 0:00u 1:00 - // Rule Crimea 1996 max - Oct lastSun 0:00u 0 - // Europe/Simferopol Ukraine(UA) 3:00 Crimea MSK/MSD //---------------------------------------------------------- kSystemTimeZones[212] = - new SimpleTimeZone(3*kMillisPerHour, "Europe/Moscow" /*MSK/MSD*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(3*U_MILLIS_PER_HOUR, "Europe/Moscow" /*MSK/MSD*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Europe/Moscow Russia(RU) 3:00 Russia MSK/MSD //---------------------------------------------------------- kSystemTimeZones[213] = - new SimpleTimeZone((int32_t)(3.5*kMillisPerHour), "Asia/Tehran" /*IR%sT*/, - Calendar::MARCH, 21, 0 /*DOM*/, 0*kMillisPerHour, - Calendar::SEPTEMBER, 23, 0 /*DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone((int32_t)(3.5*U_MILLIS_PER_HOUR), "Asia/Tehran" /*IR%sT*/, + Calendar::MARCH, 21, 0 /*DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, 23, 0 /*DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Iran 1997 1999 - Mar 21 0:00 1:00 S // Rule Iran 1997 1999 - Sep 23 0:00 0 - // Asia/Tehran Iran(IR) 3:30 Iran IR%sT kSystemTimeZones[214] = - new SimpleTimeZone((int32_t)(3.5*kMillisPerHour), "MET" /*alias for Asia/Tehran*/, - Calendar::MARCH, 21, 0 /*DOM*/, 0*kMillisPerHour, - Calendar::SEPTEMBER, 23, 0 /*DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone((int32_t)(3.5*U_MILLIS_PER_HOUR), "MET" /*alias for Asia/Tehran*/, + Calendar::MARCH, 21, 0 /*DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, 23, 0 /*DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[215] = - new SimpleTimeZone(4*kMillisPerHour, "Asia/Dubai" /*GST*/); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Asia/Dubai" /*GST*/); // Asia/Dubai United Arab Emirates(AE) 4:00 - GST //---------------------------------------------------------- kSystemTimeZones[216] = - new SimpleTimeZone(4*kMillisPerHour, "Indian/Mauritius" /*MUT*/); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Indian/Mauritius" /*MUT*/); // Indian/Mauritius Mauritius(MU) 4:00 - MUT # Mauritius Time //---------------------------------------------------------- kSystemTimeZones[217] = - new SimpleTimeZone(4*kMillisPerHour, "Asia/Muscat" /*GST*/); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Asia/Muscat" /*GST*/); // Asia/Muscat Oman(OM) 4:00 - GST //---------------------------------------------------------- kSystemTimeZones[218] = - new SimpleTimeZone(4*kMillisPerHour, "Indian/Reunion" /*RET*/); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Indian/Reunion" /*RET*/); // Indian/Reunion Reunion(RE) 4:00 - RET # Reunion Time //---------------------------------------------------------- kSystemTimeZones[219] = - new SimpleTimeZone(4*kMillisPerHour, "Indian/Mahe" /*SCT*/); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Indian/Mahe" /*SCT*/); // Indian/Mahe Seychelles(SC) 4:00 - SCT # Seychelles Time //---------------------------------------------------------- kSystemTimeZones[220] = - new SimpleTimeZone(4*kMillisPerHour, "Asia/Yerevan" /*AM%sT*/); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Asia/Yerevan" /*AM%sT*/); // Asia/Yerevan Armenia(AM) 4:00 - AM%sT kSystemTimeZones[221] = - new SimpleTimeZone(4*kMillisPerHour, "NET" /*alias for Asia/Yerevan*/); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "NET" /*alias for Asia/Yerevan*/); //---------------------------------------------------------- kSystemTimeZones[222] = - new SimpleTimeZone(4*kMillisPerHour, "Asia/Baku" /*AZ%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 5*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 5*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Asia/Baku" /*AZ%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 5*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 5*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule EUAsia 1981 max - Mar lastSun 1:00u 1:00 S // Rule EUAsia 1996 max - Oct lastSun 1:00u 0 - // Asia/Baku Azerbaijan(AZ) 4:00 EUAsia AZ%sT //---------------------------------------------------------- kSystemTimeZones[223] = - new SimpleTimeZone(4*kMillisPerHour, "Asia/Aqtau" /*AQT%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Asia/Aqtau" /*AQT%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule E-EurAsia 1981 max - Mar lastSun 0:00 1:00 S // Rule E-EurAsia 1996 max - Oct lastSun 0:00 0 - // Asia/Aqtau Kazakhstan(KZ) 4:00 E-EurAsia AQT%sT //---------------------------------------------------------- kSystemTimeZones[224] = - new SimpleTimeZone(4*kMillisPerHour, "Europe/Samara" /*SAM%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(4*U_MILLIS_PER_HOUR, "Europe/Samara" /*SAM%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Europe/Samara Russia(RU) 4:00 Russia SAM%sT //---------------------------------------------------------- kSystemTimeZones[225] = - new SimpleTimeZone((int32_t)(4.5*kMillisPerHour), "Asia/Kabul" /*AFT*/); + new SimpleTimeZone((int32_t)(4.5*U_MILLIS_PER_HOUR), "Asia/Kabul" /*AFT*/); // Asia/Kabul Afghanistan(AF) 4:30 - AFT //---------------------------------------------------------- kSystemTimeZones[226] = - new SimpleTimeZone(5*kMillisPerHour, "Indian/Kerguelen" /*TFT*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Indian/Kerguelen" /*TFT*/); // Indian/Kerguelen France - year-round bases(FR) 5:00 - TFT # ISO code TF Time //---------------------------------------------------------- kSystemTimeZones[227] = - new SimpleTimeZone(5*kMillisPerHour, "Asia/Tbilisi" /*GET*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Asia/Tbilisi" /*GET*/); // Asia/Tbilisi Georgia(GE) 5:00 - GET //---------------------------------------------------------- kSystemTimeZones[228] = - new SimpleTimeZone(5*kMillisPerHour, "Indian/Chagos" /*IOT*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Indian/Chagos" /*IOT*/); // Indian/Chagos British Indian Ocean Territory(IO) 5:00 - IOT # BIOT Time //---------------------------------------------------------- kSystemTimeZones[229] = - new SimpleTimeZone(5*kMillisPerHour, "Indian/Maldives" /*MVT*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Indian/Maldives" /*MVT*/); // Indian/Maldives Maldives(MV) 5:00 - MVT # Maldives Time //---------------------------------------------------------- kSystemTimeZones[230] = - new SimpleTimeZone(5*kMillisPerHour, "Asia/Dushanbe" /*TJT*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Asia/Dushanbe" /*TJT*/); // Asia/Dushanbe Tajikistan(TJ) 5:00 - TJT # Tajikistan Time //---------------------------------------------------------- kSystemTimeZones[231] = - new SimpleTimeZone(5*kMillisPerHour, "Asia/Ashkhabad" /*TMT*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Asia/Ashkhabad" /*TMT*/); // Asia/Ashkhabad Turkmenistan(TM) 5:00 - TMT # Turkmenistan Time //---------------------------------------------------------- kSystemTimeZones[232] = - new SimpleTimeZone(5*kMillisPerHour, "Asia/Tashkent" /*UZT*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Asia/Tashkent" /*UZT*/); // Asia/Tashkent Uzbekistan(UZ) 5:00 - UZT # Uzbekistan Time //---------------------------------------------------------- kSystemTimeZones[233] = - new SimpleTimeZone(5*kMillisPerHour, "Asia/Karachi" /*PKT*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Asia/Karachi" /*PKT*/); // Asia/Karachi Pakistan(PK) 5:00 - PKT # Pakistan Time kSystemTimeZones[234] = - new SimpleTimeZone(5*kMillisPerHour, "PLT" /*alias for Asia/Karachi*/); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "PLT" /*alias for Asia/Karachi*/); //---------------------------------------------------------- kSystemTimeZones[235] = - new SimpleTimeZone(5*kMillisPerHour, "Asia/Bishkek" /*KG%sT*/, - Calendar::APRIL, 7, -Calendar::SUNDAY /*DOW>=DOM*/, 0*kMillisPerHour, - Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Asia/Bishkek" /*KG%sT*/, + Calendar::APRIL, 7, -Calendar::SUNDAY /*DOW>=DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Kirgiz 1992 max - Apr Sun>=7 0:00 1:00 S // Rule Kirgiz 1991 max - Sep lastSun 0:00 0 - // Asia/Bishkek Kirgizstan(KG) 5:00 Kirgiz KG%sT # Kirgizstan Time //---------------------------------------------------------- kSystemTimeZones[236] = - new SimpleTimeZone(5*kMillisPerHour, "Asia/Aqtobe" /*AQT%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Asia/Aqtobe" /*AQT%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule E-EurAsia 1981 max - Mar lastSun 0:00 1:00 S // Rule E-EurAsia 1996 max - Oct lastSun 0:00 0 - // Asia/Aqtobe Kazakhstan(KZ) 5:00 E-EurAsia AQT%sT //---------------------------------------------------------- kSystemTimeZones[237] = - new SimpleTimeZone(5*kMillisPerHour, "Asia/Yekaterinburg" /*YEK%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(5*U_MILLIS_PER_HOUR, "Asia/Yekaterinburg" /*YEK%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Yekaterinburg Russia(RU) 5:00 Russia YEK%sT # Yekaterinburg Time //---------------------------------------------------------- kSystemTimeZones[238] = - new SimpleTimeZone((int32_t)(5.5*kMillisPerHour), "Asia/Calcutta" /*IST*/); + new SimpleTimeZone((int32_t)(5.5*U_MILLIS_PER_HOUR), "Asia/Calcutta" /*IST*/); // Asia/Calcutta India(IN) 5:30 - IST kSystemTimeZones[239] = - new SimpleTimeZone((int32_t)(5.5*kMillisPerHour), "IST" /*alias for Asia/Calcutta*/); + new SimpleTimeZone((int32_t)(5.5*U_MILLIS_PER_HOUR), "IST" /*alias for Asia/Calcutta*/); //---------------------------------------------------------- kSystemTimeZones[240] = - new SimpleTimeZone((int32_t)(5.75*kMillisPerHour), "Asia/Katmandu" /*NPT*/); + new SimpleTimeZone((int32_t)(5.75*U_MILLIS_PER_HOUR), "Asia/Katmandu" /*NPT*/); // Asia/Katmandu Nepal(NP) 5:45 - NPT # Nepal Time //---------------------------------------------------------- kSystemTimeZones[241] = - new SimpleTimeZone(6*kMillisPerHour, "Antarctica/Mawson" /*MAWT*/); + new SimpleTimeZone(6*U_MILLIS_PER_HOUR, "Antarctica/Mawson" /*MAWT*/); // Antarctica/Mawson Australia - territories(AQ) 6:00 - MAWT # Mawson Time //---------------------------------------------------------- kSystemTimeZones[242] = - new SimpleTimeZone(6*kMillisPerHour, "Asia/Colombo" /*LKT*/); + new SimpleTimeZone(6*U_MILLIS_PER_HOUR, "Asia/Colombo" /*LKT*/); // Asia/Colombo Sri Lanka(LK) 6:00 - LKT //---------------------------------------------------------- kSystemTimeZones[243] = - new SimpleTimeZone(6*kMillisPerHour, "Asia/Dacca" /*BDT*/); + new SimpleTimeZone(6*U_MILLIS_PER_HOUR, "Asia/Dacca" /*BDT*/); // Asia/Dacca Bangladesh(BD) 6:00 - BDT # Bangladesh Time kSystemTimeZones[244] = - new SimpleTimeZone(6*kMillisPerHour, "BST" /*alias for Asia/Dacca*/); + new SimpleTimeZone(6*U_MILLIS_PER_HOUR, "BST" /*alias for Asia/Dacca*/); //---------------------------------------------------------- kSystemTimeZones[245] = - new SimpleTimeZone(6*kMillisPerHour, "Asia/Alma-Ata" /*ALM%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(6*U_MILLIS_PER_HOUR, "Asia/Alma-Ata" /*ALM%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule E-EurAsia 1981 max - Mar lastSun 0:00 1:00 S // Rule E-EurAsia 1996 max - Oct lastSun 0:00 0 - // Asia/Alma-Ata Kazakhstan(KZ) 6:00 E-EurAsia ALM%sT //---------------------------------------------------------- kSystemTimeZones[246] = - new SimpleTimeZone(6*kMillisPerHour, "Asia/Novosibirsk" /*NOV%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(6*U_MILLIS_PER_HOUR, "Asia/Novosibirsk" /*NOV%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Novosibirsk Russia(RU) 6:00 Russia NOV%sT //---------------------------------------------------------- kSystemTimeZones[247] = - new SimpleTimeZone((int32_t)(6.5*kMillisPerHour), "Indian/Cocos" /*CCT*/); + new SimpleTimeZone((int32_t)(6.5*U_MILLIS_PER_HOUR), "Indian/Cocos" /*CCT*/); // Indian/Cocos Cocos(CC) 6:30 - CCT # Cocos Islands Time //---------------------------------------------------------- kSystemTimeZones[248] = - new SimpleTimeZone((int32_t)(6.5*kMillisPerHour), "Asia/Rangoon" /*MMT*/); + new SimpleTimeZone((int32_t)(6.5*U_MILLIS_PER_HOUR), "Asia/Rangoon" /*MMT*/); // Asia/Rangoon Burma / Myanmar(MM) 6:30 - MMT # Myanmar Time //---------------------------------------------------------- kSystemTimeZones[249] = - new SimpleTimeZone(7*kMillisPerHour, "Indian/Christmas" /*CXT*/); + new SimpleTimeZone(7*U_MILLIS_PER_HOUR, "Indian/Christmas" /*CXT*/); // Indian/Christmas Australian miscellany(AU) 7:00 - CXT # Christmas Island Time //---------------------------------------------------------- kSystemTimeZones[250] = - new SimpleTimeZone(7*kMillisPerHour, "Asia/Jakarta" /*JAVT*/); + new SimpleTimeZone(7*U_MILLIS_PER_HOUR, "Asia/Jakarta" /*JAVT*/); // Asia/Jakarta Indonesia(ID) 7:00 - JAVT //---------------------------------------------------------- kSystemTimeZones[251] = - new SimpleTimeZone(7*kMillisPerHour, "Asia/Phnom_Penh" /*ICT*/); + new SimpleTimeZone(7*U_MILLIS_PER_HOUR, "Asia/Phnom_Penh" /*ICT*/); // Asia/Phnom_Penh Cambodia(KH) 7:00 - ICT //---------------------------------------------------------- kSystemTimeZones[252] = - new SimpleTimeZone(7*kMillisPerHour, "Asia/Vientiane" /*ICT*/); + new SimpleTimeZone(7*U_MILLIS_PER_HOUR, "Asia/Vientiane" /*ICT*/); // Asia/Vientiane Laos(LA) 7:00 - ICT //---------------------------------------------------------- kSystemTimeZones[253] = - new SimpleTimeZone(7*kMillisPerHour, "Asia/Saigon" /*ICT*/); + new SimpleTimeZone(7*U_MILLIS_PER_HOUR, "Asia/Saigon" /*ICT*/); // Asia/Saigon Vietnam(VN) 7:00 - ICT kSystemTimeZones[254] = - new SimpleTimeZone(7*kMillisPerHour, "VST" /*alias for Asia/Saigon*/); + new SimpleTimeZone(7*U_MILLIS_PER_HOUR, "VST" /*alias for Asia/Saigon*/); //---------------------------------------------------------- kSystemTimeZones[255] = - new SimpleTimeZone(7*kMillisPerHour, "Asia/Bangkok" /*ICT*/); + new SimpleTimeZone(7*U_MILLIS_PER_HOUR, "Asia/Bangkok" /*ICT*/); // Asia/Bangkok Thailand(TH) 7:00 - ICT //---------------------------------------------------------- kSystemTimeZones[256] = - new SimpleTimeZone(7*kMillisPerHour, "Asia/Krasnoyarsk" /*KRA%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(7*U_MILLIS_PER_HOUR, "Asia/Krasnoyarsk" /*KRA%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Krasnoyarsk Russia(RU) 7:00 Russia KRA%sT //---------------------------------------------------------- kSystemTimeZones[257] = - new SimpleTimeZone(8*kMillisPerHour, "Antarctica/Casey" /*WST*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Antarctica/Casey" /*WST*/); // Antarctica/Casey Australia - territories(AQ) 8:00 - WST # Western (Aus) Standard Time //---------------------------------------------------------- kSystemTimeZones[258] = - new SimpleTimeZone(8*kMillisPerHour, "Australia/Perth" /*WST*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Australia/Perth" /*WST*/); // Australia/Perth Australia(AU) 8:00 - WST //---------------------------------------------------------- kSystemTimeZones[259] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Brunei" /*BNT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Brunei" /*BNT*/); // Asia/Brunei Brunei(BN) 8:00 - BNT //---------------------------------------------------------- kSystemTimeZones[260] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Hong_Kong" /*C%sT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Hong_Kong" /*C%sT*/); // Asia/Hong_Kong China(HK) 8:00 - C%sT //---------------------------------------------------------- kSystemTimeZones[261] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Ujung_Pandang" /*BORT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Ujung_Pandang" /*BORT*/); // Asia/Ujung_Pandang Indonesia(ID) 8:00 - BORT //---------------------------------------------------------- kSystemTimeZones[262] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Ishigaki" /*CST*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Ishigaki" /*CST*/); // Asia/Ishigaki Japan(JP) 8:00 - CST //---------------------------------------------------------- kSystemTimeZones[263] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Macao" /*C%sT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Macao" /*C%sT*/); // Asia/Macao Macao(MO) 8:00 - C%sT //---------------------------------------------------------- kSystemTimeZones[264] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Kuala_Lumpur" /*MYT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Kuala_Lumpur" /*MYT*/); // Asia/Kuala_Lumpur Malaysia(MY) 8:00 - MYT # Malaysia Time //---------------------------------------------------------- kSystemTimeZones[265] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Manila" /*PH%sT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Manila" /*PH%sT*/); // Asia/Manila Philippines(PH) 8:00 - PH%sT //---------------------------------------------------------- kSystemTimeZones[266] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Singapore" /*SGT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Singapore" /*SGT*/); // Asia/Singapore Singapore(SG) 8:00 - SGT //---------------------------------------------------------- kSystemTimeZones[267] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Taipei" /*C%sT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Taipei" /*C%sT*/); // Asia/Taipei Taiwan(TW) 8:00 - C%sT //---------------------------------------------------------- kSystemTimeZones[268] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Shanghai" /*C%sT*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Shanghai" /*C%sT*/); // Asia/Shanghai China(CN) 8:00 - C%sT kSystemTimeZones[269] = - new SimpleTimeZone(8*kMillisPerHour, "CTT" /*alias for Asia/Shanghai*/); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "CTT" /*alias for Asia/Shanghai*/); //---------------------------------------------------------- kSystemTimeZones[270] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Ulan_Bator" /*ULA%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, - Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Ulan_Bator" /*ULA%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, + Calendar::SEPTEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 0*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Mongol 1991 max - Mar lastSun 0:00 1:00 S // Rule Mongol 1997 max - Sep lastSun 0:00 0 - // Asia/Ulan_Bator Mongolia(MN) 8:00 Mongol ULA%sT //---------------------------------------------------------- kSystemTimeZones[271] = - new SimpleTimeZone(8*kMillisPerHour, "Asia/Irkutsk" /*IRK%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(8*U_MILLIS_PER_HOUR, "Asia/Irkutsk" /*IRK%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Irkutsk Russia(RU) 8:00 Russia IRK%sT //---------------------------------------------------------- kSystemTimeZones[272] = - new SimpleTimeZone(9*kMillisPerHour, "Asia/Jayapura" /*JAYT*/); + new SimpleTimeZone(9*U_MILLIS_PER_HOUR, "Asia/Jayapura" /*JAYT*/); // Asia/Jayapura Indonesia(ID) 9:00 - JAYT //---------------------------------------------------------- kSystemTimeZones[273] = - new SimpleTimeZone(9*kMillisPerHour, "Asia/Pyongyang" /*KST*/); + new SimpleTimeZone(9*U_MILLIS_PER_HOUR, "Asia/Pyongyang" /*KST*/); // Asia/Pyongyang ?(KP) 9:00 - KST //---------------------------------------------------------- kSystemTimeZones[274] = - new SimpleTimeZone(9*kMillisPerHour, "Asia/Seoul" /*K%sT*/); + new SimpleTimeZone(9*U_MILLIS_PER_HOUR, "Asia/Seoul" /*K%sT*/); // Asia/Seoul ?(KR) 9:00 - K%sT //---------------------------------------------------------- kSystemTimeZones[275] = - new SimpleTimeZone(9*kMillisPerHour, "Pacific/Palau" /*PWT*/); + new SimpleTimeZone(9*U_MILLIS_PER_HOUR, "Pacific/Palau" /*PWT*/); // Pacific/Palau Palau(PW) 9:00 - PWT # Palau Time //---------------------------------------------------------- kSystemTimeZones[276] = - new SimpleTimeZone(9*kMillisPerHour, "Asia/Tokyo" /*JST*/); + new SimpleTimeZone(9*U_MILLIS_PER_HOUR, "Asia/Tokyo" /*JST*/); // Asia/Tokyo Japan(JP) 9:00 - JST kSystemTimeZones[277] = - new SimpleTimeZone(9*kMillisPerHour, "JST" /*alias for Asia/Tokyo*/); + new SimpleTimeZone(9*U_MILLIS_PER_HOUR, "JST" /*alias for Asia/Tokyo*/); //---------------------------------------------------------- kSystemTimeZones[278] = - new SimpleTimeZone(9*kMillisPerHour, "Asia/Yakutsk" /*YAK%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(9*U_MILLIS_PER_HOUR, "Asia/Yakutsk" /*YAK%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Yakutsk Russia(RU) 9:00 Russia YAK%sT //---------------------------------------------------------- kSystemTimeZones[279] = - new SimpleTimeZone((int32_t)(9.5*kMillisPerHour), "Australia/Darwin" /*CST*/); + new SimpleTimeZone((int32_t)(9.5*U_MILLIS_PER_HOUR), "Australia/Darwin" /*CST*/); // Australia/Darwin Australia(AU) 9:30 - CST kSystemTimeZones[280] = - new SimpleTimeZone((int32_t)(9.5*kMillisPerHour), "ACT" /*alias for Australia/Darwin*/); + new SimpleTimeZone((int32_t)(9.5*U_MILLIS_PER_HOUR), "ACT" /*alias for Australia/Darwin*/); //---------------------------------------------------------- kSystemTimeZones[281] = - new SimpleTimeZone((int32_t)(9.5*kMillisPerHour), "Australia/Adelaide" /*CST*/, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone((int32_t)(9.5*U_MILLIS_PER_HOUR), "Australia/Adelaide" /*CST*/, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule AS 1987 max - Oct lastSun 2:00s 1:00 - // Rule AS 1995 max - Mar lastSun 2:00s 0 - // Australia/Adelaide South Australia(AU) 9:30 AS CST //---------------------------------------------------------- kSystemTimeZones[282] = - new SimpleTimeZone(10*kMillisPerHour, "Pacific/Truk" /*TRUT*/); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "Pacific/Truk" /*TRUT*/); // Pacific/Truk Micronesia(FM) 10:00 - TRUT # Truk Time //---------------------------------------------------------- kSystemTimeZones[283] = - new SimpleTimeZone(10*kMillisPerHour, "Pacific/Guam" /*GST*/); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "Pacific/Guam" /*GST*/); // Pacific/Guam Guam(GU) 10:00 - GST //---------------------------------------------------------- kSystemTimeZones[284] = - new SimpleTimeZone(10*kMillisPerHour, "Pacific/Saipan" /*MPT*/); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "Pacific/Saipan" /*MPT*/); // Pacific/Saipan N Mariana Is(MP) 10:00 - MPT //---------------------------------------------------------- kSystemTimeZones[285] = - new SimpleTimeZone(10*kMillisPerHour, "Pacific/Port_Moresby" /*PGT*/); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "Pacific/Port_Moresby" /*PGT*/); // Pacific/Port_Moresby Papua New Guinea(PG) 10:00 - PGT # Papua New Guinea Time //---------------------------------------------------------- kSystemTimeZones[286] = - new SimpleTimeZone(10*kMillisPerHour, "Australia/Brisbane" /*EST*/); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "Australia/Brisbane" /*EST*/); // Australia/Brisbane Australia(AU) 10:00 - EST //---------------------------------------------------------- kSystemTimeZones[287] = - new SimpleTimeZone(10*kMillisPerHour, "Asia/Vladivostok" /*VLA%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "Asia/Vladivostok" /*VLA%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Vladivostok Russia(RU) 10:00 Russia VLA%sT //---------------------------------------------------------- kSystemTimeZones[288] = - new SimpleTimeZone(10*kMillisPerHour, "Australia/Sydney" /*EST*/, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "Australia/Sydney" /*EST*/, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule AN 1987 max - Oct lastSun 2:00s 1:00 - // Rule AN 1996 max - Mar lastSun 2:00s 0 - // Australia/Sydney New South Wales(AU) 10:00 AN EST kSystemTimeZones[289] = - new SimpleTimeZone(10*kMillisPerHour, "AET" /*alias for Australia/Sydney*/, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "AET" /*alias for Australia/Sydney*/, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[290] = - new SimpleTimeZone((int32_t)(10.5*kMillisPerHour), "Australia/Lord_Howe" /*LHST*/, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, (int32_t)(0.5*kMillisPerHour),fgStatus); + new SimpleTimeZone((int32_t)(10.5*U_MILLIS_PER_HOUR), "Australia/Lord_Howe" /*LHST*/, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, (int32_t)(0.5*U_MILLIS_PER_HOUR),fgStatus); // Rule LH 1987 max - Oct lastSun 2:00s 0:30 - // Rule LH 1996 max - Mar lastSun 2:00s 0 - // Australia/Lord_Howe Lord Howe Island(AU) 10:30 LH LHST //---------------------------------------------------------- kSystemTimeZones[291] = - new SimpleTimeZone(11*kMillisPerHour, "Pacific/Ponape" /*PONT*/); + new SimpleTimeZone(11*U_MILLIS_PER_HOUR, "Pacific/Ponape" /*PONT*/); // Pacific/Ponape Micronesia(FM) 11:00 - PONT # Ponape Time //---------------------------------------------------------- kSystemTimeZones[292] = - new SimpleTimeZone(11*kMillisPerHour, "Pacific/Efate" /*VU%sT*/); + new SimpleTimeZone(11*U_MILLIS_PER_HOUR, "Pacific/Efate" /*VU%sT*/); // Pacific/Efate Vanuatu(VU) 11:00 - VU%sT # Vanuatu Time //---------------------------------------------------------- kSystemTimeZones[293] = - new SimpleTimeZone(11*kMillisPerHour, "Pacific/Guadalcanal" /*SBT*/); + new SimpleTimeZone(11*U_MILLIS_PER_HOUR, "Pacific/Guadalcanal" /*SBT*/); // Pacific/Guadalcanal Solomon Is(SB) 11:00 - SBT # Solomon Is Time kSystemTimeZones[294] = - new SimpleTimeZone(11*kMillisPerHour, "SST" /*alias for Pacific/Guadalcanal*/); + new SimpleTimeZone(11*U_MILLIS_PER_HOUR, "SST" /*alias for Pacific/Guadalcanal*/); //---------------------------------------------------------- kSystemTimeZones[295] = - new SimpleTimeZone(11*kMillisPerHour, "Pacific/Noumea" /*NC%sT*/, - Calendar::NOVEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::MARCH, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(11*U_MILLIS_PER_HOUR, "Pacific/Noumea" /*NC%sT*/, + Calendar::NOVEMBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::MARCH, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule NC 1997 max - Mar Sun>=1 2:00s 0 - // Rule NC 1997 max - Nov lastSun 2:00s 1:00 S // Pacific/Noumea New Caledonia(NC) 11:00 NC NC%sT //---------------------------------------------------------- kSystemTimeZones[296] = - new SimpleTimeZone(11*kMillisPerHour, "Asia/Magadan" /*MAG%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(11*U_MILLIS_PER_HOUR, "Asia/Magadan" /*MAG%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Magadan Russia(RU) 11:00 Russia MAG%sT //---------------------------------------------------------- kSystemTimeZones[297] = - new SimpleTimeZone((int32_t)(11.5*kMillisPerHour), "Pacific/Norfolk" /*NFT*/); + new SimpleTimeZone((int32_t)(11.5*U_MILLIS_PER_HOUR), "Pacific/Norfolk" /*NFT*/); // Pacific/Norfolk Norfolk(NF) 11:30 - NFT # Norfolk Time //---------------------------------------------------------- kSystemTimeZones[298] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Kosrae" /*KOST*/); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Kosrae" /*KOST*/); // Pacific/Kosrae Micronesia(FM) 12:00 - KOST # Kosrae Time //---------------------------------------------------------- kSystemTimeZones[299] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Tarawa" /*GILT*/); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Tarawa" /*GILT*/); // Pacific/Tarawa Kiribati(KI) 12:00 - GILT # Gilbert Is Time //---------------------------------------------------------- kSystemTimeZones[300] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Majuro" /*MHT*/); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Majuro" /*MHT*/); // Pacific/Majuro Marshall Is(MH) 12:00 - MHT //---------------------------------------------------------- kSystemTimeZones[301] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Nauru" /*NRT*/); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Nauru" /*NRT*/); // Pacific/Nauru Nauru(NR) 12:00 - NRT //---------------------------------------------------------- kSystemTimeZones[302] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Funafuti" /*TVT*/); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Funafuti" /*TVT*/); // Pacific/Funafuti Tuvalu(TV) 12:00 - TVT # Tuvalu Time //---------------------------------------------------------- kSystemTimeZones[303] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Wake" /*WAKT*/); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Wake" /*WAKT*/); // Pacific/Wake Wake(US) 12:00 - WAKT # Wake Time //---------------------------------------------------------- kSystemTimeZones[304] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Wallis" /*WFT*/); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Wallis" /*WFT*/); // Pacific/Wallis Wallis and Futuna(WF) 12:00 - WFT # Wallis & Futuna Time //---------------------------------------------------------- kSystemTimeZones[305] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Fiji" /*FJT*/); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Fiji" /*FJT*/); // Pacific/Fiji Fiji(FJ) 12:00 - FJT # Fiji Time //---------------------------------------------------------- kSystemTimeZones[306] = - new SimpleTimeZone(12*kMillisPerHour, "Antarctica/McMurdo" /*NZ%sT*/, - Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::MARCH, 15, -Calendar::SUNDAY /*DOW>=DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Antarctica/McMurdo" /*NZ%sT*/, + Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::MARCH, 15, -Calendar::SUNDAY /*DOW>=DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule NZAQ 1990 max - Oct Sun>=1 2:00s 1:00 D // Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 S // Antarctica/McMurdo USA - year-round bases(AQ) 12:00 NZAQ NZ%sT //---------------------------------------------------------- kSystemTimeZones[307] = - new SimpleTimeZone(12*kMillisPerHour, "Asia/Kamchatka" /*PET%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Asia/Kamchatka" /*PET%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Kamchatka Russia(RU) 12:00 Russia PET%sT //---------------------------------------------------------- kSystemTimeZones[308] = - new SimpleTimeZone(12*kMillisPerHour, "Pacific/Auckland" /*NZ%sT*/, - Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::MARCH, 15, -Calendar::SUNDAY /*DOW>=DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "Pacific/Auckland" /*NZ%sT*/, + Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::MARCH, 15, -Calendar::SUNDAY /*DOW>=DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule NZ 1990 max - Oct Sun>=1 2:00s 1:00 D // Rule NZ 1990 max - Mar Sun>=15 2:00s 0 S // Pacific/Auckland New Zealand(NZ) 12:00 NZ NZ%sT kSystemTimeZones[309] = - new SimpleTimeZone(12*kMillisPerHour, "NST" /*alias for Pacific/Auckland*/, - Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::MARCH, 15, -Calendar::SUNDAY /*DOW>=DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(12*U_MILLIS_PER_HOUR, "NST" /*alias for Pacific/Auckland*/, + Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::MARCH, 15, -Calendar::SUNDAY /*DOW>=DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[310] = - new SimpleTimeZone((int32_t)(12.75*kMillisPerHour), "Pacific/Chatham" /*CHA%sT*/, - Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, (int32_t)(2.75*kMillisPerHour), - Calendar::MARCH, 15, -Calendar::SUNDAY /*DOW>=DOM*/, (int32_t)(3.75*kMillisPerHour), 1*kMillisPerHour,fgStatus); + new SimpleTimeZone((int32_t)(12.75*U_MILLIS_PER_HOUR), "Pacific/Chatham" /*CHA%sT*/, + Calendar::OCTOBER, 1, -Calendar::SUNDAY /*DOW>=DOM*/, (int32_t)(2.75*U_MILLIS_PER_HOUR), + Calendar::MARCH, 15, -Calendar::SUNDAY /*DOW>=DOM*/, (int32_t)(3.75*U_MILLIS_PER_HOUR), 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Chatham 1990 max - Oct Sun>=1 2:45s 1:00 D // Rule Chatham 1991 max - Mar Sun>=15 2:45s 0 S // Pacific/Chatham New Zealand(NZ) 12:45 Chatham CHA%sT //---------------------------------------------------------- kSystemTimeZones[311] = - new SimpleTimeZone(13*kMillisPerHour, "Pacific/Enderbury" /*PHOT*/); + new SimpleTimeZone(13*U_MILLIS_PER_HOUR, "Pacific/Enderbury" /*PHOT*/); // Pacific/Enderbury Kiribati(KI) 13:00 - PHOT //---------------------------------------------------------- kSystemTimeZones[312] = - new SimpleTimeZone(13*kMillisPerHour, "Pacific/Tongatapu" /*TOT*/); + new SimpleTimeZone(13*U_MILLIS_PER_HOUR, "Pacific/Tongatapu" /*TOT*/); // Pacific/Tongatapu Tonga(TO) 13:00 - TOT //---------------------------------------------------------- kSystemTimeZones[313] = - new SimpleTimeZone(13*kMillisPerHour, "Asia/Anadyr" /*ANA%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(13*U_MILLIS_PER_HOUR, "Asia/Anadyr" /*ANA%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Asia/Anadyr Russia(RU) 13:00 Russia ANA%sT //---------------------------------------------------------- kSystemTimeZones[314] = - new SimpleTimeZone(14*kMillisPerHour, "Pacific/Kiritimati" /*LINT*/); + new SimpleTimeZone(14*U_MILLIS_PER_HOUR, "Pacific/Kiritimati" /*LINT*/); // Pacific/Kiritimati Kiribati(KI) 14:00 - LINT kSystemTimeZones[315] = - new SimpleTimeZone(-7*kMillisPerHour, "PNT" /*alias for America/Phoenix*/); + new SimpleTimeZone(-7*U_MILLIS_PER_HOUR, "PNT" /*alias for America/Phoenix*/); //---------------------------------------------------------- kSystemTimeZones[316] = - new SimpleTimeZone((int32_t)(-3.5*kMillisPerHour), "CNT" /*alias for America/St_Johns*/, - Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone((int32_t)(-3.5*U_MILLIS_PER_HOUR), "CNT" /*alias for America/St_Johns*/, + Calendar::APRIL, 1, -Calendar::SUNDAY /*DOW>=DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); //---------------------------------------------------------- kSystemTimeZones[317] = - new SimpleTimeZone(10*kMillisPerHour, "Antarctica/DumontDUrville" /*DDUT*/); + new SimpleTimeZone(10*U_MILLIS_PER_HOUR, "Antarctica/DumontDUrville" /*DDUT*/); // Antarctica/DumontDUrville France - year-round bases(AQ) 10:00 - DDUT # Dumont-d'Urville Time //---------------------------------------------------------- kSystemTimeZones[318] = - new SimpleTimeZone(2*kMillisPerHour, "Europe/Kaliningrad" /*EE%sT*/, - Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*kMillisPerHour, - Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*kMillisPerHour, 1*kMillisPerHour,fgStatus); + new SimpleTimeZone(2*U_MILLIS_PER_HOUR, "Europe/Kaliningrad" /*EE%sT*/, + Calendar::MARCH, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 2*U_MILLIS_PER_HOUR, + Calendar::OCTOBER, -1, Calendar::SUNDAY /*DOW_IN_DOM*/, 3*U_MILLIS_PER_HOUR, 1*U_MILLIS_PER_HOUR,fgStatus); // Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S // Rule Russia 1996 max - Oct lastSun 2:00s 0 - // Europe/Kaliningrad Russia(RU) 2:00 Russia EE%sT //---------------------------------------------------------- kSystemTimeZones[319] = - new SimpleTimeZone(6*kMillisPerHour, "Asia/Thimbu" /*BTT*/); + new SimpleTimeZone(6*U_MILLIS_PER_HOUR, "Asia/Thimbu" /*BTT*/); // Asia/Thimbu Bhutan(BT) 6:00 - BTT # Bhutan Time //---------------------------------------------------------- } @@ -1784,7 +1784,7 @@ TimeZone::initSystemTimeZones(void) // *** clean up from definitions #undef int -#undef kMillisPerHour +#undef U_MILLIS_PER_HOUR // ***************************************************************************** // class TimeZone @@ -1888,7 +1888,7 @@ TimeZone::getHashtable() /*int32_t TimeZone::stringToInteger(const UnicodeString& string, UErrorCode& status) { - if (FAILURE(status)) return 0; + if (U_FAILURE(status)) return 0; int32_t len = string.size(); char *number = new char[1 + len]; @@ -1970,7 +1970,7 @@ TimeZone::initDefault() hostID = icu_tzname(0); // Invert sign because UNIX semantics are backwards - rawOffset = icu_timezone() * -kMillisPerSecond; + rawOffset = icu_timezone() * -U_MILLIS_PER_SECOND; } // create UnicodeString ID from hostID (to avoid Mutex deadlock) @@ -2135,7 +2135,7 @@ TimeZone::getDisplayName(bool_t daylight, EDisplayType style, const Locale& loca SimpleDateFormat format(style == LONG ? "zzzz" : "z",locale,status); - if(!SUCCESS(status)) + if(!U_SUCCESS(status)) { // *** SRL what do I do here?!! return result.remove(); @@ -2155,7 +2155,7 @@ TimeZone::getDisplayName(bool_t daylight, EDisplayType style, const Locale& loca new SimpleTimeZone(getRawOffset(), getID(tempID), Calendar::JANUARY - 1, 1, 0, 0, - Calendar::DECEMBER + 1, 31, 0, kMillisPerDay, status) : + Calendar::DECEMBER + 1, 31, 0, U_MILLIS_PER_DAY, status) : new SimpleTimeZone(getRawOffset(), getID(tempID)); format.applyPattern(style == LONG ? "zzzz" : "z"); diff --git a/icu4c/source/i18n/ubrk.cpp b/icu4c/source/i18n/ubrk.cpp index 4ffdd981df8..0b2cd25b342 100644 --- a/icu4c/source/i18n/ubrk.cpp +++ b/icu4c/source/i18n/ubrk.cpp @@ -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(); diff --git a/icu4c/source/i18n/ucal.cpp b/icu4c/source/i18n/ucal.cpp index 1c66e77f2e6..a6ff34c2434 100644 --- a/icu4c/source/i18n/ucal.cpp +++ b/icu4c/source/i18n/ucal.cpp @@ -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: diff --git a/icu4c/source/i18n/ucol.cpp b/icu4c/source/i18n/ucol.cpp index c86fe51c4a4..bedfceb6146 100644 --- a/icu4c/source/i18n/ucol.cpp +++ b/icu4c/source/i18n/ucol.cpp @@ -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); } diff --git a/icu4c/source/i18n/ucol.h b/icu4c/source/i18n/ucol.h index af9a6a26b8c..060eb11bebc 100644 --- a/icu4c/source/i18n/ucol.h +++ b/icu4c/source/i18n/ucol.h @@ -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); diff --git a/icu4c/source/i18n/udat.cpp b/icu4c/source/i18n/udat.cpp index e3fa77ce846..5ad32e4f68e 100644 --- a/icu4c/source/i18n/udat.cpp +++ b/icu4c/source/i18n/udat.cpp @@ -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); diff --git a/icu4c/source/i18n/udat.h b/icu4c/source/i18n/udat.h index 20a66c97d14..4a8a1085ef8 100644 --- a/icu4c/source/i18n/udat.h +++ b/icu4c/source/i18n/udat.h @@ -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, diff --git a/icu4c/source/i18n/umsg.cpp b/icu4c/source/i18n/umsg.cpp index 4535333c437..8334dd222c5 100644 --- a/icu4c/source/i18n/umsg.cpp +++ b/icu4c/source/i18n/umsg.cpp @@ -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 = ""); 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); diff --git a/icu4c/source/i18n/umsg.h b/icu4c/source/i18n/umsg.h index 353a8b93cfe..d1396a3c5b7 100644 --- a/icu4c/source/i18n/umsg.h +++ b/icu4c/source/i18n/umsg.h @@ -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, diff --git a/icu4c/source/i18n/unum.cpp b/icu4c/source/i18n/unum.cpp index a5b322f9880..c6edf9b748d 100644 --- a/icu4c/source/i18n/unum.cpp +++ b/icu4c/source/i18n/unum.cpp @@ -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) { diff --git a/icu4c/source/i18n/unum.h b/icu4c/source/i18n/unum.h index faea734315b..a915b45c3cf 100644 --- a/icu4c/source/i18n/unum.h +++ b/icu4c/source/i18n/unum.h @@ -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); diff --git a/icu4c/source/samples/XMLConverter/XMLConverter.cpp b/icu4c/source/samples/XMLConverter/XMLConverter.cpp index 692147fff64..37f10258845 100644 --- a/icu4c/source/samples/XMLConverter/XMLConverter.cpp +++ b/icu4c/source/samples/XMLConverter/XMLConverter.cpp @@ -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, diff --git a/icu4c/source/samples/cal/cal.c b/icu4c/source/samples/cal/cal.c index eafc691f742..928d7250df0 100644 --- a/icu4c/source/samples/cal/cal.c +++ b/icu4c/source/samples/cal/cal.c @@ -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; diff --git a/icu4c/source/samples/cal/uprint.c b/icu4c/source/samples/cal/uprint.c index dfd49ac7576..c17b16f7336 100644 --- a/icu4c/source/samples/cal/uprint.c +++ b/icu4c/source/samples/cal/uprint.c @@ -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 { diff --git a/icu4c/source/samples/date/date.c b/icu4c/source/samples/date/date.c index 0da66f722b4..48001ffe6d4 100644 --- a/icu4c/source/samples/date/date.c +++ b/icu4c/source/samples/date/date.c @@ -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 */ diff --git a/icu4c/source/samples/date/uprint.c b/icu4c/source/samples/date/uprint.c index 57ada0489fb..d336eb8ac5a 100644 --- a/icu4c/source/samples/date/uprint.c +++ b/icu4c/source/samples/date/uprint.c @@ -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 { diff --git a/icu4c/source/test/cintltst/callcoll.c b/icu4c/source/test/cintltst/callcoll.c index 3c0aebeaea2..60768d44119 100644 --- a/icu4c/source/test/cintltst/callcoll.c +++ b/icu4c/source/test/cintltst/callcoll.c @@ -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); diff --git a/icu4c/source/test/cintltst/capitst.c b/icu4c/source/test/cintltst/capitst.c index f9d4ee9b40c..1edeead2898 100644 --- a/icu4c/source/test/cintltst/capitst.c +++ b/icu4c/source/test/cintltst/capitst.c @@ -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; } diff --git a/icu4c/source/test/cintltst/cbiapts.c b/icu4c/source/test/cintltst/cbiapts.c index b61beddd5fa..574f4e4dd53 100644 --- a/icu4c/source/test/cintltst/cbiapts.c +++ b/icu4c/source/test/cintltst/cbiapts.c @@ -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); diff --git a/icu4c/source/test/cintltst/cbiditst.c b/icu4c/source/test/cintltst/cbiditst.c index 2b708780cd0..e19c71a6a7b 100644 --- a/icu4c/source/test/cintltst/cbiditst.c +++ b/icu4c/source/test/cintltst/cbiditst.c @@ -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 @@ -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; } diff --git a/icu4c/source/test/cintltst/ccurrtst.c b/icu4c/source/test/cintltst/ccurrtst.c index 9f80691a0ec..136237761c1 100644 --- a/icu4c/source/test/cintltst/ccurrtst.c +++ b/icu4c/source/test/cintltst/ccurrtst.c @@ -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; diff --git a/icu4c/source/test/cintltst/cdantst.c b/icu4c/source/test/cintltst/cdantst.c index 9b30cfd4803..ad9acc3fdfb 100644 --- a/icu4c/source/test/cintltst/cdantst.c +++ b/icu4c/source/test/cintltst/cdantst.c @@ -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); diff --git a/icu4c/source/test/cintltst/cdattst.c b/icu4c/source/test/cintltst/cdattst.c index 3031bfad209..124e9afcfe8 100644 --- a/icu4c/source/test/cintltst/cdattst.c +++ b/icu4c/source/test/cintltst/cdattst.c @@ -62,32 +62,32 @@ void TestDateFormat() /*Testing udat_open() to open a dateformat */ log_verbose("\nTesting udat_open() with various parameters\n"); fr = udat_open(UDAT_FULL, UDAT_DEFAULT, "fr_FR", NULL,0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using full time style with french locale\n %s\n", myErrorName(status) ); } def = udat_open(UDAT_SHORT, UDAT_SHORT, NULL, NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using short date and time style\n %s\n", myErrorName(status) ); } it = udat_open(UDAT_DEFAULT, UDAT_MEDIUM, "it_IT", NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using medium date style with italian locale\n %s\n", myErrorName(status) ); } de = udat_open(UDAT_LONG, UDAT_LONG, "de_DE", NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using long time and date styles with german locale\n %s\n", myErrorName(status)); } /*creating a default dateformat */ def1 = udat_open(UDAT_SHORT, UDAT_SHORT, NULL, NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using short date and time style\n %s\n", myErrorName(status) ); @@ -107,7 +107,7 @@ void TestDateFormat() /*Testing udat_clone()*/ log_verbose("\nTesting the udat_clone() function of date format\n"); copy=udat_clone(def, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in creating the clone using udat_clone: %s\n", myErrorName(status) ); } /*if(def != copy) @@ -126,7 +126,7 @@ void TestDateFormat() result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_format(def, d, result, resultlength, &pos, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in formatting using udat_format(.....) %s\n", myErrorName(status) ); } @@ -160,7 +160,7 @@ free(result); parsepos=0; d1=udat_parse(def, temp, u_strlen(temp), &parsepos, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in parsing using udat_parse(.....) %s\n", myErrorName(status) ); } @@ -180,7 +180,7 @@ free(result); log_verbose("\nTesting the udat_openPattern with a specified pattern\n"); /*for french locale */ fr_pat=udat_openPattern(temp, u_strlen(temp), "fr_FR", &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in creating a date format using udat_openPattern \n %s\n", myErrorName(status) ); @@ -203,7 +203,7 @@ free(result); result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_toPattern(def1, FALSE, result, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in extracting the pattern from UNumberFormat\n %s\n", myErrorName(status) ); @@ -230,12 +230,12 @@ free(result); /*Test get2DigitYearStart set2DigitYearStart */ log_verbose("\nTesting the get and set 2DigitYearStart properties\n"); d1= udat_get2DigitYearStart(fr_pat,&status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("ERROR: udat_get2DigitYearStart failed %s\n", myErrorName(status) ); } status = U_ZERO_ERROR; udat_set2DigitYearStart(def1 ,d1, &status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("ERROR: udat_set2DigitYearStart failed %s\n", myErrorName(status) ); } if(udat_get2DigitYearStart(fr_pat, &status) != udat_get2DigitYearStart(def1, &status)) @@ -244,7 +244,7 @@ free(result); log_verbose("PASS: set2DigitYearStart successful\n"); /*try setting it to another value */ udat_set2DigitYearStart(de, 2000.0, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_verbose("ERROR: udat_set2DigitYearStart failed %s\n", myErrorName(status) ); } if(udat_get2DigitYearStart(de, &status) != 2000) @@ -311,7 +311,7 @@ void TestSymbols() /*creating a dateformat with french locale */ log_verbose("\ncreating a date format with french locale\n"); fr = udat_open(UDAT_FULL, UDAT_DEFAULT, "fr_FR", NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in creating the dateformat using full time style with french locale\n %s\n", myErrorName(status) ); @@ -319,7 +319,7 @@ void TestSymbols() /*creating a default dateformat */ log_verbose("\ncreating a date format with default locale\n"); def = udat_open(UDAT_DEFAULT,UDAT_DEFAULT ,NULL, NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in creating the dateformat using short date and time style\n %s\n", myErrorName(status) ); @@ -351,7 +351,7 @@ void TestSymbols() udat_getSymbols(fr, UDAT_WEEKDAYS, 5, result, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in udat_getSymbols().... %s\n", myErrorName(status) ); } @@ -393,7 +393,7 @@ free(pattern); pattern=(UChar*)malloc(sizeof(UChar) * resultlength); udat_toPattern(fr, FALSE, pattern, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in extracting the pattern from UNumberFormat\n %s\n", myErrorName(status) ); @@ -409,7 +409,7 @@ free(pattern); result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_toPattern(fr, FALSE,result, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in extracting the pattern from UNumberFormat\n %s\n", myErrorName(status) ); @@ -431,12 +431,12 @@ free(pattern); udat_getSymbols(fr, UDAT_MONTHS, 11, result, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("FAIL: error in getSymbols() %s\n", myErrorName(status) ); resultlength=resultlengthout+1; udat_setSymbols(def, UDAT_MONTHS, 11, result, resultlength, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in udat_setSymbols() : %s\n", myErrorName(status) ); } @@ -451,7 +451,7 @@ free(pattern); value=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(def, UDAT_MONTHS, 11, value, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("FAIL: error in retrieving the value using getSymbols i.e roundtrip\n"); if(u_strcmp(result, value)!=0) @@ -512,7 +512,7 @@ void VerifygetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, int32_t i udat_getSymbols(datfor, type, index, result, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in udat_getSymbols()... %s\n", myErrorName(status) ); return; @@ -537,7 +537,7 @@ void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, int32_t i value=(UChar*)malloc(sizeof(UChar) * (strlen(expected) + 1)); u_uastrcpy(value, expected); udat_setSymbols(datfor, type, index, value, u_strlen(value), &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in udat_setSymbols() %s\n", myErrorName(status) ); return; @@ -551,7 +551,7 @@ void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, int32_t i result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(datfor, type, index, result, resultlength, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: error in retrieving the value using getSymbols after setting it previously\n %s\n", myErrorName(status) ); return; @@ -584,14 +584,14 @@ void VerifygetsetSymbols(UDateFormat* from, UDateFormat* to, UDateFormatSymbolTy result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(from, type, index, result, resultlength, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: error in getSymbols() %s\n", myErrorName(status) ); return; } resultlength=resultlengthout+1; udat_setSymbols(to, type, index, result, resultlength, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in udat_setSymbols() : %s\n", myErrorName(status) ); return; @@ -605,7 +605,7 @@ void VerifygetsetSymbols(UDateFormat* from, UDateFormat* to, UDateFormatSymbolTy value=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(to, type, index, value, resultlength, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: error in retrieving the value using getSymbols i.e roundtrip\n %s\n", myErrorName(status) ); return; @@ -640,7 +640,7 @@ UChar* myNumformat(const UNumberFormat* numfor, double d) result2=(UChar*)malloc(sizeof(UChar) * resultlength); unum_formatDouble(numfor, d, result2, resultlength, &pos, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in formatting using unum_format(.....) %s\n", myErrorName(status) ); return 0; diff --git a/icu4c/source/test/cintltst/cdetst.c b/icu4c/source/test/cintltst/cdetst.c index 3a2e34a88f6..707305c620d 100644 --- a/icu4c/source/test/cintltst/cdetst.c +++ b/icu4c/source/test/cintltst/cdetst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /** * CollationGermanTest is a third level test class. This tests the locale @@ -127,7 +127,7 @@ void TestTertiary( ) int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("de_DE", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing German Collation with Tertiary strength\n"); @@ -146,7 +146,7 @@ void TestPrimary() int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("de_DE", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing German Collation with primary strength\n"); diff --git a/icu4c/source/test/cintltst/cdtdptst.c b/icu4c/source/test/cintltst/cdtdptst.c index ecaaa8b3977..6c397f210c4 100644 --- a/icu4c/source/test/cintltst/cdtdptst.c +++ b/icu4c/source/test/cintltst/cdtdptst.c @@ -59,7 +59,7 @@ void TestTwoDigitYearDSTParse() pattern=(UChar*)malloc(sizeof(UChar) * (strlen("EEE MMM dd HH:mm:ss.SSS zzz yyyy G")+1 )); u_uastrcpy(pattern, "EEE MMM dd HH:mm:ss.SSS zzz yyyy G"); fullFmt= udat_openPattern(pattern, u_strlen(pattern), "en_US", &status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("FAIL: Error in creating a date format using udat_openPattern \n %s\n", myErrorName(status) ); } @@ -103,7 +103,7 @@ void TestPartialParse994() null=0; f = udat_open(UDAT_DEFAULT, UDAT_SHORT, NULL, NULL, 0, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: ErrorCode received during test: %s\n", myErrorName(status)); } s=(UChar*)malloc(sizeof(UChar) * (strlen("01/01/97 10:11:42 AM")+1) ); @@ -137,7 +137,7 @@ void tryPat994(UDateFormat* format, const char* pattern, const char* s, UDate ex udat_applyPattern(format, FALSE, pat, u_strlen(pat)); pos=0; date = udat_parse(format, str, u_strlen(str), &pos, &status); - if(FAILURE(status) || date == null) { + if(U_FAILURE(status) || date == null) { log_verbose("ParseException: : %s\n", myErrorName(status) ); if (expected != null) log_err("FAIL: Expected: %s\n", austrdup(myDateFormat(format, expected)) ); @@ -170,7 +170,7 @@ void TestRunTogetherPattern985() pattern=(UChar*)malloc(sizeof(UChar) * (strlen("yyyyMMddHHmmssSSS")+1) ); u_uastrcpy(pattern, "yyyyMMddHHmmssSSS"); format = udat_openPattern(pattern, u_strlen(pattern), NULL, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in date format construction with pattern: %s\n", myErrorName(status)); } date1 = ucal_getNow(); @@ -203,7 +203,7 @@ void TestCzechMonths459() UErrorCode status = U_ZERO_ERROR; fmt = udat_open(UDAT_FULL, UDAT_FULL, "cs", NULL, 0, &status); - if(FAILURE(status)){log_err("Error in constructing the date format\n"); } + if(U_FAILURE(status)){log_err("Error in constructing the date format\n"); } lneed=0; lneed=udat_toPattern(fmt, TRUE, NULL, lneed, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ @@ -211,11 +211,11 @@ void TestCzechMonths459() pattern=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); udat_toPattern(fmt, TRUE, pattern, lneed+1, &status); } - if(FAILURE(status)){ log_err("Error in extracting the pattern\n"); } + if(U_FAILURE(status)){ log_err("Error in extracting the pattern\n"); } tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "GMT"); cal=ucal_open(tzID, u_strlen(tzID), "cs", UCAL_GREGORIAN, &status); - if(FAILURE(status)){ log_err("error in ucal_open caldef : %s\n", myErrorName(status)); } + if(U_FAILURE(status)){ log_err("error in ucal_open caldef : %s\n", myErrorName(status)); } ucal_setDate(cal, 1997, UCAL_JUNE, 15, &status); june=ucal_getMillis(cal, &status); @@ -259,11 +259,11 @@ void TestQuotePattern161() u_uastrcpy(pattern, "MM/dd/yyyy 'at' hh:mm:ss a zzz"); format= udat_openPattern(pattern, u_strlen(pattern), NULL, &status); - if(FAILURE(status)){ log_err("error in udat_openPattern : %s\n", myErrorName(status)); } + if(U_FAILURE(status)){ log_err("error in udat_openPattern : %s\n", myErrorName(status)); } tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "PST"); cal=ucal_open(tzID, u_strlen(tzID), NULL, UCAL_TRADITIONAL, &status); - if(FAILURE(status)){ log_err("error in ucal_open cal : %s\n", myErrorName(status)); } + if(U_FAILURE(status)){ log_err("error in ucal_open cal : %s\n", myErrorName(status)); } ucal_setDateTime(cal, 1999, UCAL_APRIL, 13, 10, 42, 28, &status); currentTime_1 = ucal_getMillis(cal, &status); diff --git a/icu4c/source/test/cintltst/cdtrgtst.c b/icu4c/source/test/cintltst/cdtrgtst.c index 2513d21ef56..716ff96e50f 100644 --- a/icu4c/source/test/cintltst/cdtrgtst.c +++ b/icu4c/source/test/cintltst/cdtrgtst.c @@ -13,7 +13,7 @@ * * File CDTRGTST.C * -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API * Modification History: * Date Name Description * 07/15/99 helena Ported to HPUX 10/11 CC. @@ -63,7 +63,7 @@ void Test4029195() today = ucal_getNow(); df = udat_open(UDAT_DEFAULT,UDAT_DEFAULT ,NULL, NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using default date and time style : %s\n", myErrorName(status)); } @@ -91,7 +91,7 @@ void Test4029195() log_verbose("After teh pattern is applied\n today: %s\n", austrdup(todayS) ); parsepos=0; d1=udat_parse(df, todayS, u_strlen(todayS), &parsepos, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in parsing using udat_parse(.....): %s\n", myErrorName(status)); } @@ -138,12 +138,12 @@ void Test4056591() tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "PST"); cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("error in ucal_open caldef : %s\n", myErrorName(status)); } ucal_setDateTime(cal, 1809, UCAL_DECEMBER, 25, 17, 40, 30, &status); d[0]=ucal_getMillis(cal, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error: failure in get millis: %s\n", myErrorName(status)); } ucal_setDateTime(cal, 1909, UCAL_DECEMBER, 24, 17, 40, 30, &status); @@ -156,13 +156,13 @@ void Test4056591() u_uastrcpy(pat, "yyMMdd"); def = udat_openPattern(pat, u_strlen(pat), NULL, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using u_openPattern(): %s\n", myErrorName(status)); } start = 1800; udat_set2DigitYearStart(def, start, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("ERROR: in setTwoDigitStartDate: %s\n", myErrorName(status)); if( (udat_get2DigitYearStart(def, &status) != start)) log_err("ERROR: get2DigitYearStart broken\n"); @@ -199,7 +199,7 @@ void Test4059917() u_uastrcpy(pattern, "yyyy/MM/dd"); log_verbose("%s\n", austrdup(pattern) ); def = udat_openPattern(pattern, u_strlen(pattern), NULL, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using openPattern: %s\n", myErrorName(status)); } @@ -211,7 +211,7 @@ void Test4059917() u_uastrcpy(pattern, "yyyyMMdd"); def = udat_openPattern(pattern, u_strlen(pattern), NULL, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using openPattern: %s\n", myErrorName(status)); } @@ -240,7 +240,7 @@ void aux917( UDateFormat *fmt, UChar* str) pat=(UChar*)malloc(sizeof(UChar) * (resultlength)); udat_toPattern(fmt, TRUE, pat, resultlength, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("failure in retrieving the pattern: %s\n", myErrorName(status)); } log_verbose("pattern: %s\n", austrdup(pat) ); @@ -277,7 +277,7 @@ void Test4060212() fmt = udat_open(UDAT_FULL,UDAT_LONG ,NULL, NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using default date and time style: %s\n", myErrorName(status) ); @@ -285,7 +285,7 @@ void Test4060212() myString = myFormatit(fmt, myDate); u_uastrcpy(tzID, "PST"); cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: error in ucal_open caldef : %s\n", myErrorName(status)); } ucal_setMillis(cal, myDate, &status); @@ -316,7 +316,7 @@ void Test4061287() status = U_ZERO_ERROR; log_verbose("Testing parsing by changing the attribute lenient\n"); df = udat_openPattern(pattern, u_strlen(pattern), NULL, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: failure in open pattern of test4061287: %s\n", myErrorName(status)); } @@ -328,7 +328,7 @@ void Test4061287() log_err("setLenient nor working\n"); ok = FALSE; myDate = udat_parse(df, dateString, u_strlen(dateString), &pos, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) ok = TRUE; if(ok!=TRUE) log_err("Fail: Lenient not working: does lenient parsing in spite of setting Leninent as FALSE "); @@ -367,7 +367,7 @@ void Test4073003() }; fmt= udat_open(UDAT_SHORT,UDAT_SHORT ,NULL, NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: error in creating the dateformat using short date and time style: %s\n", myErrorName(status)); @@ -382,7 +382,7 @@ void Test4073003() pos=0; d = udat_parse(fmt, datestr, u_strlen(datestr), &pos, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR : in test 4073003: %s\n", myErrorName(status)); } @@ -393,7 +393,7 @@ void Test4073003() pos=0; status=U_ZERO_ERROR; dd = udat_parse(fmt, datestr, u_strlen(datestr), &pos, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR : in test 4073003: %s\n", myErrorName(status)); } free(datestr); @@ -428,12 +428,12 @@ void Test4162071() status = U_ZERO_ERROR; /* Can't hardcode the result to assume the default locale is "en_US". */ df = udat_openPattern(format, u_strlen(format), "en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: couldn't create date format: %s\n", myErrorName(status)); } pos=0; x = udat_parse(df, datestr, u_strlen(datestr), &pos, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR : parse format %s failes : %s\n", austrdup(format), myErrorName(status)); } else{ @@ -460,7 +460,7 @@ UChar* myFormatit(UDateFormat* datdef, UDate d1) result1=(UChar*)malloc(sizeof(UChar) * resultlength); udat_format(datdef, d1, result1, resultlength, &pos, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("FAIL: Error in formatting using udat_format(.....): %s\n", myErrorName(status)); return 0; diff --git a/icu4c/source/test/cintltst/cestst.c b/icu4c/source/test/cintltst/cestst.c index d5a489d30dd..ff990a87c25 100644 --- a/icu4c/source/test/cintltst/cestst.c +++ b/icu4c/source/test/cintltst/cestst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /** * CollationSpanishTest is a third level test class. This tests the locale @@ -110,7 +110,7 @@ void TestTertiary( ) int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("es_ES", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing Spanish Collation with Tertiary strength\n"); @@ -128,7 +128,7 @@ void TestPrimary() int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("es_ES", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing Spanish Collation with Primary strength\n"); diff --git a/icu4c/source/test/cintltst/cfintst.c b/icu4c/source/test/cintltst/cfintst.c index 4fa652ac0d5..fe3c018ea1f 100644 --- a/icu4c/source/test/cintltst/cfintst.c +++ b/icu4c/source/test/cintltst/cfintst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /** * CollationFinnishTest is a third level test class. This tests the locale @@ -101,7 +101,7 @@ void TestTertiary( ) int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("fi_FI", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing Finnish Collation with Tertiary strength\n"); @@ -119,7 +119,7 @@ void TestPrimary() int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("fi_FI", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing Finnish Collation with Tertiary strength\n"); diff --git a/icu4c/source/test/cintltst/cformtst.c b/icu4c/source/test/cintltst/cformtst.c index 8ceacd78756..8c54f1f159a 100644 --- a/icu4c/source/test/cintltst/cformtst.c +++ b/icu4c/source/test/cintltst/cformtst.c @@ -95,7 +95,7 @@ UChar* myDateFormat(UDateFormat* dat, UDate d1) result1=(UChar*)malloc(sizeof(UChar) * resultlength); udat_format(dat, d1, result1, resultlength, &pos, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Error in formatting using udat_format(.....): %s\n", myErrorName(status)); return 0; diff --git a/icu4c/source/test/cintltst/cfrtst.c b/icu4c/source/test/cintltst/cfrtst.c index b318dddc3d6..28e7b1ba93f 100644 --- a/icu4c/source/test/cintltst/cfrtst.c +++ b/icu4c/source/test/cintltst/cfrtst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /** * CollationFrenchTest is a third level test class. This tests the locale @@ -171,7 +171,7 @@ void TestTertiary( ) int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("fr_FR", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing French Collation with Tertiary strength\n"); @@ -189,7 +189,7 @@ void TestSecondary() UCollationResult expected; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("fr_FR", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing French Collation with Secondary strength\n"); @@ -213,7 +213,7 @@ void TestExtra() int32_t i, j; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("fr_FR", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing French Collation extra with secondary strength\n"); diff --git a/icu4c/source/test/cintltst/cg7coll.c b/icu4c/source/test/cintltst/cg7coll.c index f8ce44c4f02..1b91c9eb090 100644 --- a/icu4c/source/test/cintltst/cg7coll.c +++ b/icu4c/source/test/cintltst/cg7coll.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /** * G7CollationTest is a third level test class. This test performs the examples @@ -198,7 +198,7 @@ void TestG7Locales() { status = U_ZERO_ERROR; myCollation = ucol_open(locales[i], &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err("Error in creating collator in %s: %s\n", locales[i], myErrorName(status)); continue; @@ -208,7 +208,7 @@ void TestG7Locales() status = U_ZERO_ERROR; tblColl1 = ucol_openRules(defRules, rlen, UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err("Error in creating collator in %s: %s\n", locales[i], myErrorName(status)); @@ -245,7 +245,7 @@ void TestDemo1() log_verbose("Demo Test 1 : Create a new table collation with rules \" & Z < p, P \" \n"); status = U_ZERO_ERROR; col = ucol_open(NULL, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in creation of Collator in Demo1 :%s\n", myErrorName(status)); return; } @@ -261,7 +261,7 @@ void TestDemo1() myCollation = ucol_openRules(newRules, len, UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err( "Demo Test 1 Rule collation object creation failed. : %s\n", myErrorName(status)); return; @@ -292,7 +292,7 @@ void TestDemo2() log_verbose("Demo Test 2 : Create a new table collation with rules \"& C < ch , cH, Ch, CH\""); status = U_ZERO_ERROR; col = ucol_open(NULL, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in creation of Collator in Demo1 : %s\n", myErrorName(status)); return; } @@ -307,7 +307,7 @@ void TestDemo2() myCollation = ucol_openRules(newRules, len, UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err( "Demo Test 2 Rule collation object creation failed.: %s\n", myErrorName(status)); return; @@ -337,7 +337,7 @@ void TestDemo3() log_verbose("Demo Test 3 : Create a new table collation with rules \"& Question'-'mark ; '?' & Hash'-'mark ; '#' & Ampersand ; '&'\" \n"); status = U_ZERO_ERROR; col = ucol_open(NULL, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in creation of Collator in Demo3 : %s\n", myErrorName(status)); return; } @@ -352,7 +352,7 @@ void TestDemo3() myCollation = ucol_openRules(newRules, len, UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err( "Demo Test 3 Rule collation object creation failed.: %s\n", myErrorName(status)); return; @@ -384,7 +384,7 @@ void TestDemo4() log_verbose("Demo Test 4 : Create a new table collation with rules \" & aa ; a'-' & ee ; e'-' & ii ; i'-' & oo ; o'-' & uu ; u'-' \"\n"); status = U_ZERO_ERROR; col = ucol_open(NULL, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in creation of Collator in Demo1 : %s\n", myErrorName(status)); return; } @@ -399,7 +399,7 @@ void TestDemo4() myCollation = ucol_openRules(newRules, len, UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err( "Demo Test 4 Rule collation object creation failed.: %s\n", myErrorName(status)); return; diff --git a/icu4c/source/test/cintltst/cintltst.h b/icu4c/source/test/cintltst/cintltst.h index 667a2d555dc..1f6d32a125b 100644 --- a/icu4c/source/test/cintltst/cintltst.h +++ b/icu4c/source/test/cintltst/cintltst.h @@ -28,7 +28,7 @@ The main root for C API tests #include "utypes.h" #include "ctest.h" -C_FUNC void addAllTests(TestNode** root); +U_CFUNC void addAllTests(TestNode** root); /** *complete a relative path to a full pathname, and convert to platform-specific syntax. @@ -37,19 +37,19 @@ C_FUNC void addAllTests(TestNode** root); * @maxsize the maximum size of the string * @relPath the relative path name */ -C_FUNC void ctest_pathnameInContext(char* fullname, int32_t maxsize, const char* relPath ) ; +U_CFUNC void ctest_pathnameInContext(char* fullname, int32_t maxsize, const char* relPath ) ; /** *Fetches the current path name of the test directory *returns the path of the test directory */ -C_FUNC const char* ctest_getTestDirectory(void); +U_CFUNC const char* ctest_getTestDirectory(void); /** * * sets the path of the test directory * @param newDir the test directory to be set */ -C_FUNC void ctest_setTestDirectory(const char* newDir); +U_CFUNC void ctest_setTestDirectory(const char* newDir); /** * Convert a const UChar* into a char* * Caller owns storage, but in practice this function @@ -58,7 +58,7 @@ C_FUNC void ctest_setTestDirectory(const char* newDir); * @return new char* to the unichars in host format */ -C_FUNC char *austrdup(const UChar* unichars); +U_CFUNC char *austrdup(const UChar* unichars); /** diff --git a/icu4c/source/test/cintltst/citertst.c b/icu4c/source/test/cintltst/citertst.c index f06d46417e3..f73a8974f05 100644 --- a/icu4c/source/test/cintltst/citertst.c +++ b/icu4c/source/test/cintltst/citertst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /* * Collation Iterator tests. @@ -68,7 +68,7 @@ void TestPrevious() en_us = ucol_open("en_US", &status); iter=ucol_openElements(en_us, test1, u_strlen(test1), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of collation element iterator using ucol_openElements()\n %s\n", myErrorName(status)); return; @@ -80,7 +80,7 @@ void TestPrevious() /* Test with a contracting character sequence */ u_uastrcpy(rule, " < a,A < b,B < c,C, d,D < z,Z < ch,cH,Ch,CH"); c1 = ucol_openRules(rule, u_strlen(rule), UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status); - if (c1 == NULL || FAILURE(status)) + if (c1 == NULL || U_FAILURE(status)) { log_err("Couldn't create a RuleBasedCollator with a contracting sequence\n %s\n", myErrorName(status)); @@ -89,7 +89,7 @@ void TestPrevious() source=(UChar*)malloc(sizeof(UChar) * 20); u_uastrcpy(source, "abchdcba"); iter=ucol_openElements(c1, source, u_strlen(source), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of collation element iterator using ucol_openElements()\n %s\n", myErrorName(status)); return; @@ -102,7 +102,7 @@ void TestPrevious() /* Test with an expanding character sequence */ u_uastrcpy(rule, "< a < b < c/abd < d"); c2 = ucol_openRules(rule, u_strlen(rule), UCOL_NO_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status); - if (c2 == NULL || FAILURE(status)) + if (c2 == NULL || U_FAILURE(status)) { log_err("Couldn't create a RuleBasedCollator with a contracting sequence.\n %s\n", myErrorName(status)); @@ -111,7 +111,7 @@ void TestPrevious() source=(UChar*)malloc(sizeof(UChar) * 5); u_uastrcpy(source, "abcd"); iter=ucol_openElements(c2, source, u_strlen(source), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of collation element iterator using ucol_openElements()\n %s\n", myErrorName(status)); return; @@ -123,7 +123,7 @@ void TestPrevious() /* Now try both */ u_uastrcpy(rule, "< a < b < c/aba < d < z < ch"); c3 = ucol_openRules(rule, u_strlen(rule), UCOL_DEFAULT_NORMALIZATION, UCOL_DEFAULT_STRENGTH, &status); - if (c3 == NULL || FAILURE(status)) + if (c3 == NULL || U_FAILURE(status)) { log_err("Couldn't create a RuleBasedCollator with a contracting sequence.\n %s\n", myErrorName(status)); @@ -132,7 +132,7 @@ void TestPrevious() source=(UChar*)malloc(sizeof(UChar) * 10); u_uastrcpy(source, "abcdbchdc"); iter=ucol_openElements(c3, source, u_strlen(source), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of collation element iterator using ucol_openElements()\n %s\n", myErrorName(status)); return; @@ -163,7 +163,7 @@ void TestOffset() en_us = ucol_open("en_US", &status); log_verbose("Testing getOffset and setOffset for CollationElements\n"); iter=ucol_openElements(en_us, test1, u_strlen(test1), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of collation element iterator using ucol_openElements()\n %s\n", myErrorName(status)); return; @@ -182,7 +182,7 @@ void TestOffset() /* Now set the offset back to the beginning and see if it works */ pristine=ucol_openElements(en_us, test1, u_strlen(test1), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of collation element iterator using ucol_openElements()\n %s\n", myErrorName(status)); return; @@ -190,7 +190,7 @@ void TestOffset() status = U_ZERO_ERROR; ucol_setOffset(iter, 0, &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err("setOffset failed. %s\n", myErrorName(status)); } @@ -222,13 +222,13 @@ void TestSetText() en_us = ucol_open("en_US", &status); log_verbose("testing setText for Collation elements\n"); iter1=ucol_openElements(en_us, test1, u_strlen(test1), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of collation element iterator1 using ucol_openElements()\n %s\n", myErrorName(status)); return; } iter2=ucol_openElements(en_us, test2, u_strlen(test2), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of collation element iterator2 using ucol_openElements()\n %s\n", myErrorName(status)); return; @@ -240,7 +240,7 @@ void TestSetText() while ( ++i < 10 && c != UCOL_NULLORDER) { - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err("iter2->next() returned an error. %s\n", myErrorName(status)); ucol_closeElements(iter2); @@ -253,7 +253,7 @@ void TestSetText() /* Now set it to point to the same string as the first iterator */ ucol_setText(iter2, test1, u_strlen(test1), &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err("call to iter2->setText(test1) failed. %s\n", myErrorName(status)); } diff --git a/icu4c/source/test/cintltst/cjaptst.c b/icu4c/source/test/cintltst/cjaptst.c index 2105aa568a6..5c355c0783c 100644 --- a/icu4c/source/test/cintltst/cjaptst.c +++ b/icu4c/source/test/cintltst/cjaptst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /** * CollationKannaTest is a third level test class. This tests the locale @@ -113,7 +113,7 @@ void TestTertiary( ) int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("ja_JP", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing Kanna(Japan) Collation with Tertiary strength\n"); diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index 585df4167c5..1e9493eb1bd 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* */ #include "utypes.h" @@ -99,7 +99,7 @@ void TestBasicGetters() { temp=(char*)malloc(sizeof(char) * (cap+1)); uloc_getLanguage(testLocale, temp, cap, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in uloc_getLanguage %s\n", myErrorName(status)); } if (0 !=strcmp(temp,rawData2[LANG][i])) { @@ -114,7 +114,7 @@ void TestBasicGetters() { temp=(char*)realloc(temp, sizeof(char) * (cap+1)); uloc_getCountry(testLocale, temp, cap, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in uloc_getCountry %s\n", myErrorName(status)); } if (0 != strcmp(temp, rawData2[CTRY][i])) { @@ -128,7 +128,7 @@ void TestBasicGetters() { temp=(char*)realloc(temp, sizeof(char) * (cap+1)); uloc_getVariant(testLocale, temp, cap, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in uloc_getVariant %s\n", myErrorName(status)); } if (0 != strcmp(temp, rawData2[VAR][i])) { @@ -144,7 +144,7 @@ void TestBasicGetters() { name=(char*)malloc(sizeof(char) * (cap+1)); uloc_getName(testLocale, name, cap, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in uloc_getName %s\n", myErrorName(status)); } if (0 != strcmp(name, rawData2[NAME][i])){ @@ -221,7 +221,7 @@ void TestDisplayNames() strcpy(defaultLocale, saveDefault); uloc_setDefault("en_US", &err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { log_err("uloc_setDefault returned error code "); return; } @@ -242,7 +242,7 @@ void TestDisplayNames() doTestDisplayNames("el_GR", DLANG_EL, FALSE); uloc_setDefault("fr_FR", &err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { log_err("Locale::setDefault returned error code %s\n", myErrorName(err)); return; } @@ -261,7 +261,7 @@ void TestDisplayNames() doTestDisplayNames("el_GR", DLANG_EL, TRUE); uloc_setDefault(defaultLocale, &err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { log_err("Locale::setDefault returned error code %s\n", myErrorName(err)); return; } @@ -374,7 +374,7 @@ void doTestDisplayNames(const char* inLocale, uloc_getLanguage(uloc_getDefault(), temp, 5, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in getDefault %s \n", myErrorName(status)); } if (defaultIsFrench && 0 != strcmp(temp, "fr")) { @@ -408,7 +408,7 @@ void doTestDisplayNames(const char* inLocale, } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in getDisplayLanguage() %s\n", myErrorName(status)); } @@ -420,7 +420,7 @@ void doTestDisplayNames(const char* inLocale, testCtry=(UChar*)malloc(sizeof(UChar) * (maxresultsize + 1)); uloc_getDisplayCountry(testLocale, NULL, testCtry, maxresultsize, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in getDisplayCountry() %s\n", myErrorName(status)); } @@ -433,7 +433,7 @@ void doTestDisplayNames(const char* inLocale, testVar=(UChar*)malloc(sizeof(UChar) * (maxresultsize+1)); uloc_getDisplayVariant(testLocale, NULL, testVar, maxresultsize, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in getDisplayVariant() %s\n", myErrorName(status)); } @@ -445,7 +445,7 @@ void doTestDisplayNames(const char* inLocale, testName=(UChar*)malloc(sizeof(UChar) * (maxresultsize+1)); uloc_getDisplayName(testLocale, NULL, testName, maxresultsize, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in getDisplayName() %s\n", myErrorName(status)); } @@ -460,7 +460,7 @@ void doTestDisplayNames(const char* inLocale, testLang=(UChar*)malloc(sizeof(UChar) * (maxresultsize+1)); uloc_getDisplayLanguage(testLocale, inLocale, testLang, maxresultsize, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in getDisplayLanguage() %s\n", myErrorName(status)); } @@ -472,7 +472,7 @@ void doTestDisplayNames(const char* inLocale, testCtry=(UChar*)malloc(sizeof(UChar) * (maxresultsize+1)); uloc_getDisplayCountry(testLocale, inLocale, testCtry, maxresultsize, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in getDisplayCountry() %s\n", myErrorName(status)); } @@ -484,7 +484,7 @@ void doTestDisplayNames(const char* inLocale, testVar=(UChar*)malloc(sizeof(UChar) * (maxresultsize+1)); uloc_getDisplayVariant(testLocale, inLocale, testVar, maxresultsize, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in getDisplayVariant() %s\n", myErrorName(status)); } @@ -496,7 +496,7 @@ void doTestDisplayNames(const char* inLocale, testName=(UChar*)malloc(sizeof(UChar) * (maxresultsize+1)); uloc_getDisplayName(testLocale, inLocale, testName, maxresultsize, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in getDisplayName() %s\n", myErrorName(status)); } diff --git a/icu4c/source/test/cintltst/cmsgtst.c b/icu4c/source/test/cintltst/cmsgtst.c index 9fa2d82203e..ddc313521d0 100644 --- a/icu4c/source/test/cintltst/cmsgtst.c +++ b/icu4c/source/test/cintltst/cmsgtst.c @@ -98,7 +98,7 @@ void MessageFormatTest( void ) u_formatMessage( "en_US",testCasePatterns[i], patternlength, result, resultlength, &status, 1, 3456.00, d1); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: failure in message format on testcase %d: %s\n", i, myErrorName(status) ); } if(u_strcmp(result, testResultStrings[i])==0){ @@ -139,7 +139,7 @@ void TestSampleMessageFormat() result=(UChar*)realloc(result, sizeof(UChar) * resultlength); u_formatMessage( "en_US", pattern, u_strlen(pattern), result, resultlength, &status, str, d); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error: failure in message format on test#1: %s\n", myErrorName(status)); } if(u_strcmp(result, expected)==0) @@ -170,7 +170,7 @@ void TestSampleMessageFormat() result=(UChar*)realloc(result, sizeof(UChar) * (resultlength+1)); u_formatMessage( "en_US", pattern, u_strlen(pattern), result, resultlength, &status, str, 23); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error: failure in message format on test#2 : %s\n", myErrorName(status)); } if(u_strcmp(result, expected)==0) @@ -195,7 +195,7 @@ void TestSampleMessageFormat() result=(UChar*)malloc(sizeof(UChar) * resultlength); u_formatMessage( "en_US", pattern, u_strlen(pattern), result, resultlength, &status, str, 500.00); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error: failure in message format on test#3 : %s\n", myErrorName(status)); } if(u_strcmp(result, expected)==0) @@ -231,12 +231,12 @@ void TestSampleFormatAndParse() tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "PST"); cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("error in ucal_open caldef : %s\n", myErrorName(status) ); } ucal_setDateTime(cal, 1999, UCAL_MARCH, 18, 0, 0, 0, &status); d1=ucal_getMillis(cal, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error: failure in get millis: %s\n", myErrorName(status) ); } @@ -254,7 +254,7 @@ void TestSampleFormatAndParse() u_formatMessage( "en_US", pattern, u_strlen(pattern), result, resultlength, &status, d1, str, 7); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: failure in message format test#4: %s\n", myErrorName(status)); } if(u_strcmp(result, expected)==0) @@ -268,12 +268,12 @@ void TestSampleFormatAndParse() /*try to parse this and check*/ log_verbose("\nTesting the parse Message test#5\n"); def1 = udat_open(UDAT_DEFAULT,UDAT_DEFAULT ,NULL, NULL, 0, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in creating the dateformat using short date and time style:\n %s\n", myErrorName(status)); } u_parseMessage("en_US", pattern, u_strlen(pattern), result, u_strlen(result), &status, &d, ret, &value); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: error in parsing: test#5: %s\n", myErrorName(status)); } if(value!=7.00 && u_strcmp(str,ret)!=0) @@ -319,7 +319,7 @@ void TestMsgFormatChoice() result=(UChar*)malloc(sizeof(UChar) * resultlength); u_formatMessage( "en_US", pattern, u_strlen(pattern), result, resultlength, &status, 100., str); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: failure in message format on test#6 : %s\n", myErrorName(status)); } if(u_strcmp(result, expected)==0) @@ -341,7 +341,7 @@ void TestMsgFormatChoice() result=(UChar*)malloc(sizeof(UChar) * resultlength); u_formatMessage( "en_US", pattern, u_strlen(pattern), result, resultlength, &status, 0., str); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: failure in message format on test#7 : %s\n", myErrorName(status)); } if(u_strcmp(result, expected)==0) @@ -363,7 +363,7 @@ void TestMsgFormatChoice() result=(UChar*)malloc(sizeof(UChar) * resultlength); u_formatMessage( "en_US", pattern, u_strlen(pattern), result, resultlength, &status, 1., str); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: failure in message format on test#8 : %s\n", myErrorName(status)); } if(u_strcmp(result, expected)==0) @@ -394,7 +394,7 @@ void TestParseMessage() u_uastrcpy(res,"deposited"); u_parseMessage( "en_US", pattern, u_strlen(pattern), source, u_strlen(source), &status, str, &value); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: failure in parse Message on test#9: %s\n", myErrorName(status)); } if(value==500.00 && u_strcmp(str,res)==0) @@ -411,7 +411,7 @@ void TestParseMessage() u_uastrcpy(res,"MyDisk"); u_parseMessage( "en_US", pattern, u_strlen(pattern), source, u_strlen(source), &status, &value, str); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: failure in parse Message on test#10: %s\n", myErrorName(status)); } if(value==123.00 && u_strcmp(str,res)==0) diff --git a/icu4c/source/test/cintltst/cnmdptst.c b/icu4c/source/test/cintltst/cnmdptst.c index 40cebbba57d..52f2da283a9 100644 --- a/icu4c/source/test/cintltst/cnmdptst.c +++ b/icu4c/source/test/cintltst/cnmdptst.c @@ -65,7 +65,7 @@ void TestPatterns() status = U_ZERO_ERROR; u_uastrcpy(upat, pat[i]); fmt= unum_openPattern(upat, u_strlen(upat), "en_US", &status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { log_err("FAIL: Number format constructor failed for pattern %s\n", pat[i]); continue; } @@ -76,7 +76,7 @@ void TestPatterns() unewp=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_toPattern(fmt, FALSE, unewp, lneed+1, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Number format extracting the pattern failed for %s\n", pat[i]); } u_uastrcpy(unewpat, newpat[i]); @@ -90,7 +90,7 @@ void TestPatterns() str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_format(fmt, 0, str, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } u_uastrcpy(unum, num[i]); @@ -115,7 +115,7 @@ void TestQuotes() log_verbose("\nTestting the handling of quotes in number format\n"); u_uastrcpy(pat, "a'fo''o'b#"); fmt =unum_openPattern(pat, u_strlen(pat), "en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in number format costruction using pattern \"a'fo''o'b#\"\n"); } lneed=0; @@ -125,7 +125,7 @@ void TestQuotes() str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_format(fmt, 123, str, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } log_verbose("Pattern \"%s\" \n", austrdup(pat) ); @@ -143,7 +143,7 @@ void TestQuotes() fmt =unum_openPattern(pat, u_strlen(pat), "en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in number format costruction using pattern \"a''b#\"\n"); } lneed=0; @@ -153,7 +153,7 @@ void TestQuotes() str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_format(fmt, 123, str, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } log_verbose("Pattern \"%s\" \n", austrdup(pat) ); @@ -225,7 +225,7 @@ void TestExponential() upat=(UChar*)malloc(sizeof(UChar) * (strlen(pat[p])+1) ); u_uastrcpy(upat, pat[p]); fmt=unum_openPattern(upat, u_strlen(upat), "en_US", &status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { log_err("FAIL: Bad status returned by Number format construction with pattern %s\n, pat[i]"); continue; } @@ -242,7 +242,7 @@ void TestExponential() str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(fmt, val[v], str, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } @@ -274,7 +274,7 @@ void TestExponential() str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(fmt, lval[v], str, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } /*printf(" Format %e -> %s\n", lval[v], austrdup(str) );*/ @@ -319,7 +319,7 @@ void TestCurrencySign() pattern=(UChar*)malloc(sizeof(UChar) * (strlen("\xA4#,##0.00;-\xA4#,##0.00") + 1) ); u_uastrcpy(pattern, "\xA4#,##0.00;-\xA4#,##0.00"); fmt = unum_openPattern(pattern, u_strlen(pattern), "en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Error in number format construction with pattern \"\\xA4#,##0.00;-\\xA4#,##0.00\\\" \n"); } lneed=0; @@ -329,7 +329,7 @@ void TestCurrencySign() str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(fmt, 1234.56, str, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } lneed=0; @@ -356,7 +356,7 @@ void TestCurrencySign() str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(fmt, -1234.56, str, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } res=(UChar*)malloc(sizeof(UChar) * (strlen("-$1,234.56")+1) ); @@ -384,7 +384,7 @@ void TestCurrency() for(i=0; i < 3; i++) { currencyFmt = unum_open(UNUM_CURRENCY, locale[i], &status); - if(FAILURE(status)){log_err("Error in the construction of number format with style currency:\n%s\n", + if(U_FAILURE(status)){log_err("Error in the construction of number format with style currency:\n%s\n", myErrorName(status)); } lneed=0; @@ -394,7 +394,7 @@ void TestCurrency() str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(currencyFmt, 1.50, str, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status) ); } res=(UChar*)malloc(sizeof(UChar) * (strlen(result[i])+1) ); @@ -412,7 +412,7 @@ void TestRounding487() UNumberFormat *nnf; UErrorCode status = U_ZERO_ERROR; nnf = unum_open(UNUM_DEFAULT, NULL, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: failure in the construction of number format: %s\n", myErrorName(status)); } roundingTest(nnf, 0.00159999, 4, "0.0016"); @@ -443,7 +443,7 @@ void roundingTest(UNumberFormat* nf, double x, int32_t maxFractionDigits, const out=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(nf, x, out, lneed+1, &pos, &status); } - if(FAILURE(status)) { + if(U_FAILURE(status)) { log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status) ); } /*Need to use log_verbose here. Problem with the float*/ diff --git a/icu4c/source/test/cintltst/cnormtst.c b/icu4c/source/test/cintltst/cnormtst.c index 676b327c205..bc883eae927 100644 --- a/icu4c/source/test/cintltst/cnormtst.c +++ b/icu4c/source/test/cintltst/cnormtst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /*tests for u_normalization*/ #include "utypes.h" @@ -107,7 +107,7 @@ void TestDecomp() UChar *source, *result; status = U_ZERO_ERROR; myCollation = ucol_open("en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } resLen=0; @@ -123,7 +123,7 @@ void TestDecomp() result=(UChar*)malloc(sizeof(UChar*) * resLen); u_normalize(source, u_strlen(source), UCOL_DECOMP_CAN, UCOL_IGNORE_HANGUL, result, resLen, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR in u_normalize at %s: %s\n", austrdup(source), myErrorName(status) ); } assertEqual(result, CharsToUChars(canonTests[x][1]), x); @@ -138,7 +138,7 @@ void TestCompatDecomp() UChar *source, *result; status = U_ZERO_ERROR; myCollation = ucol_open("en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } resLen=0; @@ -154,7 +154,7 @@ void TestCompatDecomp() result=(UChar*)malloc(sizeof(UChar*) * resLen); u_normalize(source, u_strlen(source), UCOL_DECOMP_COMPAT,UCOL_IGNORE_HANGUL, result, resLen, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR in u_normalize at %s: %s\n", austrdup(source), myErrorName(status) ); } assertEqual(result, CharsToUChars(compatTests[x][1]), x); @@ -169,7 +169,7 @@ void TestCanonDecompCompose() UChar *source, *result; status = U_ZERO_ERROR; myCollation = ucol_open("en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } resLen=0; @@ -185,7 +185,7 @@ void TestCanonDecompCompose() result=(UChar*)malloc(sizeof(UChar*) * resLen); u_normalize(source, u_strlen(source), UCOL_DECOMP_CAN_COMP_COMPAT, UCOL_IGNORE_HANGUL, result, resLen, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR in u_normalize at %s: %s\n", austrdup(source),myErrorName(status) ); } assertEqual(result, CharsToUChars(canonTests[x][2]), x); @@ -200,7 +200,7 @@ void TestCompatDecompCompose() UChar *source, *result; status = U_ZERO_ERROR; myCollation = ucol_open("en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } resLen=0; @@ -216,7 +216,7 @@ void TestCompatDecompCompose() result=(UChar*)malloc(sizeof(UChar*) * resLen); u_normalize(source, u_strlen(source), UCOL_DECOMP_COMPAT_COMP_CAN, UCOL_IGNORE_HANGUL, result, resLen, &status); } - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR in u_normalize at %s: %s\n", austrdup(source), myErrorName(status) ); } assertEqual(result, CharsToUChars(compatTests[x][2]), x); diff --git a/icu4c/source/test/cintltst/cnumtst.c b/icu4c/source/test/cintltst/cnumtst.c index d8d25a623cd..29afcb324e2 100644 --- a/icu4c/source/test/cintltst/cnumtst.c +++ b/icu4c/source/test/cintltst/cnumtst.c @@ -69,44 +69,44 @@ void TestNumberFormat() status = U_ZERO_ERROR; log_verbose("Testing unum_open() with default style and locale\n"); def=unum_open(style, NULL, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("Error in creating NumberFormat default using unum_open(): %s\n", myErrorName(status)); log_verbose("\nTesting unum_open() with french locale and default style(decimal)\n"); fr=unum_open(style, "fr_FR", &status); - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("Error: could not create NumberFormat (french): %s\n", myErrorName(status)); log_verbose("\nTesting unum_open(currency,NULL,status)\n"); style=UNUM_CURRENCY; /* Can't hardcode the result to assume the default locale is "en_US". */ cur_def=unum_open(style, "en_US", &status); - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("Error: could not create NumberFormat using \n unum_open(currency, NULL, &status) %s\n", myErrorName(status) ); log_verbose("\nTesting unum_open(currency, frenchlocale, status)\n"); cur_fr=unum_open(style, "fr_FR", &status); - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("Error: could not create NumberFormat using unum_open(currency, french, &status): %s\n", myErrorName(status)); log_verbose("\nTesting unum_open(percent, NULL, status)\n"); style=UNUM_PERCENT; per_def=unum_open(style, NULL, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("Error: could not create NumberFormat using unum_open(percent, NULL, &status): %s\n", myErrorName(status)); log_verbose("\nTesting unum_open(percent,frenchlocale, status)\n"); per_fr=unum_open(style, "fr_FR", &status); - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("Error: could not create NumberFormat using unum_open(percent, french, &status): %s\n", myErrorName(status)); /* log_verbose("\nTesting unum_open(spellout, NULL, status)"); style=UNUM_SPELLOUT; spellout_def=unum_open(style, NULL, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) log_err("Error: could not create NumberFormat using unum_open(spellout, NULL, &status): %s\n", myErrorName(status)); */ @@ -140,7 +140,7 @@ void TestNumberFormat() unum_format(cur_def, l, result, resultlength, &pos1, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } @@ -163,7 +163,7 @@ free(result); result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_formatDouble(cur_def, d, result, resultlength, &pos2, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status)); } @@ -177,7 +177,7 @@ free(result); parsepos=0; log_verbose("\nTesting unum_parseDouble()\n"); d1=unum_parseDouble(cur_def, result, u_strlen(result), &parsepos, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("parse failed. The error is : %s\n", myErrorName(status)); } @@ -200,14 +200,14 @@ free(result); result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_format(per_fr, l, result, resultlength, &pos1, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status)); } l1=unum_parse(per_fr, result, u_strlen(result), &parsepos, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("parse failed. The error is : %s\n", myErrorName(status)); } @@ -223,7 +223,7 @@ free(result); log_verbose("\nTesting unum_openPattern()\n"); u_uastrcpy(temp1, "#,##0.0#;(#,##0.0#)"); pattern=unum_openPattern(temp1, u_strlen(temp1), NULL, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in unum_openPattern(): %s\n", myErrorName(status) );; } @@ -241,7 +241,7 @@ free(result); result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_toPattern(pattern, FALSE, result, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in extracting the pattern from UNumberFormat: %s\n", myErrorName(status)); } @@ -267,13 +267,13 @@ free(temp1); result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_toPattern(cur_def, FALSE, result, resultlength, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in extracting the pattern from UNumberFormat: %s\n", myErrorName(status)); } cur_frpattern=unum_openPattern(result, u_strlen(result), "fr_FR", &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in unum_openPattern(): %s\n", myErrorName(status)); } @@ -293,7 +293,7 @@ free(result); result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_format(cur_def, l, result, resultlength, &pos1, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status)); } @@ -301,7 +301,7 @@ free(result); /*set the symbols of cur_frpattern to cur_def */ unum_setSymbols(cur_frpattern, &symbols1, &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("Fail: error in unum_setSymbols: %s\n", myErrorName(status)); } @@ -337,7 +337,7 @@ free(result); temp1=(UChar*)malloc(sizeof(UChar) * resultlength); unum_format(cur_frpattern, l, temp1, resultlength, &pos1, &status); } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status)); } @@ -351,17 +351,17 @@ free(temp1); log_verbose("\nTesting getting and setting text attributes\n"); resultlength=5; unum_getTextAttribute(cur_fr, UNUM_NEGATIVE_SUFFIX, temp, resultlength, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Failure in gettting the Text attributes of number format: %s\n", myErrorName(status)); } unum_setTextAttribute(cur_def, UNUM_NEGATIVE_SUFFIX, temp, u_strlen(temp), &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Failure in gettting the Text attributes of number format: %s\n", myErrorName(status)); } unum_getTextAttribute(cur_def, UNUM_NEGATIVE_SUFFIX, suffix, resultlength, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Failure in gettting the Text attributes of number format: %s\n", myErrorName(status)); } @@ -376,12 +376,12 @@ free(temp1); /*checking some more text setter conditions */ u_uastrcpy(prefix, "+"); unum_setTextAttribute(def, UNUM_POSITIVE_PREFIX, prefix, u_strlen(prefix) , &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in setting the text attributes : %s\n", myErrorName(status)); } unum_getTextAttribute(def, UNUM_POSITIVE_PREFIX, temp, resultlength, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in getting the text attributes : %s\n", myErrorName(status)); } @@ -393,12 +393,12 @@ free(temp1); u_uastrcpy(prefix, "+"); unum_setTextAttribute(def, UNUM_NEGATIVE_PREFIX, prefix, u_strlen(prefix), &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in setting the text attributes : %s\n", myErrorName(status)); } unum_getTextAttribute(def, UNUM_NEGATIVE_PREFIX, temp, resultlength, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in getting the text attributes : %s\n", myErrorName(status)); } @@ -409,13 +409,13 @@ free(temp1); u_uastrcpy(suffix, "+"); unum_setTextAttribute(def, UNUM_NEGATIVE_SUFFIX, suffix, u_strlen(suffix) , &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in setting the text attributes: %s\n", myErrorName(status)); } unum_getTextAttribute(def, UNUM_NEGATIVE_SUFFIX, temp, resultlength, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("error in getting the text attributes : %s\n", myErrorName(status)); } diff --git a/icu4c/source/test/cintltst/cregrtst.c b/icu4c/source/test/cintltst/cregrtst.c index 924415aa03a..7e641fcae58 100644 --- a/icu4c/source/test/cintltst/cregrtst.c +++ b/icu4c/source/test/cintltst/cregrtst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI, added extra functions and tests +* Madhu Katragadda Ported for C API, added extra functions and tests ********************************************************************************* */ @@ -675,7 +675,7 @@ void TestForwardSentenceSelection() UBreakIterator *e; addTestSentenceData(); e = ubrk_open(UBRK_SENTENCE, "en_US", testSentenceText, u_strlen(testSentenceText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -692,7 +692,7 @@ void TestFirstSentenceSelection() UBreakIterator *e; addTestSentenceData(); e = ubrk_open(UBRK_SENTENCE, "en_US", testSentenceText, u_strlen(testSentenceText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -708,7 +708,7 @@ void TestLastSentenceSelection() UBreakIterator *e; addTestSentenceData(); e = ubrk_open(UBRK_SENTENCE, "en_US", testSentenceText, u_strlen(testSentenceText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -724,7 +724,7 @@ void TestBackwardSentenceSelection() UBreakIterator *e; addTestSentenceData(); e = ubrk_open(UBRK_SENTENCE, "en_US", testSentenceText, u_strlen(testSentenceText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -740,7 +740,7 @@ void TestForwardSentenceIndexSelection() UBreakIterator *e; addTestSentenceData(); e = ubrk_open(UBRK_SENTENCE, "en_US", testSentenceText, u_strlen(testSentenceText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -756,7 +756,7 @@ void TestBackwardSentenceIndexSelection() UBreakIterator *e; addTestSentenceData(); e = ubrk_open(UBRK_SENTENCE, "en_US", testSentenceText, u_strlen(testSentenceText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -792,7 +792,7 @@ void TestForwardWordSelection() UBreakIterator *e; addTestWordData(); e = ubrk_open(UBRK_WORD, "en_US", testWordText, u_strlen(testWordText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -809,7 +809,7 @@ void TestFirstWordSelection() UBreakIterator *e; addTestWordData(); e = ubrk_open(UBRK_WORD, "en_US", testWordText, u_strlen(testWordText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -825,7 +825,7 @@ void TestLastWordSelection() UBreakIterator *e; addTestWordData(); e = ubrk_open(UBRK_WORD, "en_US", testWordText, u_strlen(testWordText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -841,7 +841,7 @@ void TestBackwardWordSelection() UBreakIterator *e; addTestWordData(); e = ubrk_open(UBRK_WORD, "en_US", testWordText, u_strlen(testWordText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -857,7 +857,7 @@ void TestForwardWordIndexSelection() UBreakIterator *e; addTestWordData(); e = ubrk_open(UBRK_WORD, "en_US", testWordText, u_strlen(testWordText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -873,7 +873,7 @@ void TestBackwardWordIndexSelection() UBreakIterator *e; addTestWordData(); e = ubrk_open(UBRK_WORD, "en_US", testWordText, u_strlen(testWordText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -911,7 +911,7 @@ void TestForwardLineSelection() UBreakIterator *e; addTestLineData(); e = ubrk_open(UBRK_LINE, "en_US", testLineText, u_strlen(testLineText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -926,7 +926,7 @@ void TestFirstLineSelection() UBreakIterator *e; addTestLineData(); e = ubrk_open(UBRK_LINE, "en_US", testLineText, u_strlen(testLineText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -942,7 +942,7 @@ void TestLastLineSelection() UBreakIterator *e; addTestLineData(); e = ubrk_open(UBRK_LINE, "en_US", testLineText, u_strlen(testLineText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -958,7 +958,7 @@ void TestBackwardLineSelection() UBreakIterator *e; addTestLineData(); e = ubrk_open(UBRK_LINE, "en_US", testLineText, u_strlen(testLineText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -974,7 +974,7 @@ void TestForwardLineIndexSelection() UBreakIterator *e; addTestLineData(); e = ubrk_open(UBRK_LINE, "en_US", testLineText, u_strlen(testLineText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -990,7 +990,7 @@ void TestBackwardLineIndexSelection() UBreakIterator *e; addTestLineData(); e = ubrk_open(UBRK_LINE, "en_US", testLineText, u_strlen(testLineText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -1038,7 +1038,7 @@ AllocateTextBoundary(); work[2] = s[k]; e = ubrk_open(UBRK_LINE, "en_US", work, u_strlen(work), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator in testLineInvaiants:\n %s\n", myErrorName(status)); return; } @@ -1075,7 +1075,7 @@ AllocateTextBoundary(); continue; work[2] = c; e = ubrk_open(UBRK_LINE, "en_US", work, u_strlen(work), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator in testLineInvaiants:\n %s \n", myErrorName(status)); return; } @@ -1107,7 +1107,7 @@ void TestForwardCharacterSelection() UBreakIterator *e; addTestCharacterData(); e = ubrk_open(UBRK_CHARACTER, "en_US", testCharacterText, u_strlen(testCharacterText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -1123,7 +1123,7 @@ void TestFirstCharacterSelection() UBreakIterator *e; addTestCharacterData(); e = ubrk_open(UBRK_CHARACTER, "en_US", testCharacterText, u_strlen(testCharacterText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -1139,7 +1139,7 @@ void TestLastCharacterSelection() UBreakIterator *e; addTestCharacterData(); e = ubrk_open(UBRK_CHARACTER, "en_US", testCharacterText, u_strlen(testCharacterText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -1155,7 +1155,7 @@ void TestBackwardCharacterSelection() UBreakIterator *e; addTestCharacterData(); e = ubrk_open(UBRK_CHARACTER, "en_US", testCharacterText, u_strlen(testCharacterText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -1171,7 +1171,7 @@ void TestForwardCharacterIndexSelection() UBreakIterator *e; addTestCharacterData(); e = ubrk_open(UBRK_CHARACTER, "en_US", testCharacterText, u_strlen(testCharacterText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -1187,7 +1187,7 @@ void TestBackwardCharacterIndexSelection() UBreakIterator *e; addTestCharacterData(); e = ubrk_open(UBRK_CHARACTER, "en_US", testCharacterText, u_strlen(testCharacterText), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -1227,7 +1227,7 @@ void TestPreceding() u_uastrcpy(words3, "aaa bbb ccc"); log_verbose("Testting preceding...\n"); e = ubrk_open(UBRK_WORD, "en_US", words3, u_strlen(words3), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in ubrk_open() for word breakiterator: %s\n", myErrorName(status)); } @@ -1257,7 +1257,7 @@ void TestEndBehaviour() u_uastrcpy(testString, "boo"); log_verbose("Testing end behaviour\n"); wb = ubrk_open(UBRK_WORD, "en_US", testString, u_strlen(testString), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("FAIL: Error in opening the word break Iterator: %s\n", myErrorName(status)); return; } @@ -1546,7 +1546,7 @@ void doBreakInvariantTest(UBreakIteratorType type, UChar* testChars) work[2] = testChars[k]; tb=ubrk_open(type, "en_US", work, u_strlen(work), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR in opening the breakIterator in doVariant Function: %s\n", myErrorName(status)); } seen2 = FALSE; @@ -1588,7 +1588,7 @@ void doOtherInvariantTest(UBreakIteratorType type , UChar* testChars) for (j = 0; j < u_strlen(testChars); j++) { work[3] = testChars[j]; tb=ubrk_open(type, "en_US", work, u_strlen(work), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR in opening the breakIterator in doVariant Function: %s\n", myErrorName(status)); } for ( k = ubrk_first(tb); k != UBRK_DONE; k = ubrk_next(tb)) @@ -1617,7 +1617,7 @@ void doOtherInvariantTest(UBreakIteratorType type , UChar* testChars) continue; work[2] = c; tb=ubrk_open(type, "en_US", work, u_strlen(work), &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR in opening the breakIterator in doOtherVariant Function %s\n", myErrorName(status)); } for (k = ubrk_first(tb); k != UBRK_DONE; k = ubrk_next(tb)) diff --git a/icu4c/source/test/cintltst/crestst.c b/icu4c/source/test/cintltst/crestst.c index 4eef583f42e..e1c07fbad5f 100644 --- a/icu4c/source/test/cintltst/crestst.c +++ b/icu4c/source/test/cintltst/crestst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API * 06/14/99 stephen Updated for RB API changes (no suffix). ********************************************************************************* */ @@ -169,7 +169,7 @@ void TestConstruction1() test1=ures_open(directory, NULL, &err); test2=ures_open(directory, locale, &err); - if(FAILURE(err)) + if(U_FAILURE(err)) { log_err("construction did not succeed : %s \n", myErrorName(status)); return; @@ -179,7 +179,7 @@ void TestConstruction1() result2= ures_get(test2, "string_in_Default_te_te_IN", &err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { log_err("Something threw an error in TestConstruction(): %s\n", myErrorName(status)); return; @@ -214,14 +214,14 @@ void TestConstruction2() log_verbose("Testing ures_openW().......\n"); test4=ures_openW(widedirectory, locale, &err); - if(FAILURE(err)){ + if(U_FAILURE(err)){ log_err("Error in the construction using ures_openW(): %s\n", myErrorName(err)); return; } result4=ures_get(test4, "string_in_Default_te_te_IN", &err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { log_err("Something threw an error in TestConstruction() %s\n", myErrorName(err)); return; } @@ -374,7 +374,7 @@ bool_t testTag(const char* frag, status = U_ZERO_ERROR; ures_get(theBundle, tag, &status); - if(SUCCESS(status)) + if(U_SUCCESS(status)) { status = U_ZERO_ERROR; string=ures_get(theBundle, tag, &status); @@ -385,7 +385,7 @@ bool_t testTag(const char* frag, CONFIRM_ErrorCode(status, expected_resource_status); - if(SUCCESS(status)){ + if(U_SUCCESS(status)){ expected_string=(UChar*)malloc(sizeof(UChar)*(u_strlen(base) + 3)); u_strcpy(expected_string,base); @@ -426,7 +426,7 @@ bool_t testTag(const char* frag, index=j; ures_getArrayItem(theBundle, tag,index , &status); - if(SUCCESS(status)) + if(U_SUCCESS(status)) string=ures_getArrayItem(theBundle, tag, index, &status); @@ -437,7 +437,7 @@ bool_t testTag(const char* frag, CONFIRM_ErrorCode(status,expected_status); - if (SUCCESS(status)) + if (U_SUCCESS(status)) { UChar element[3]; @@ -477,7 +477,7 @@ bool_t testTag(const char* frag, row=k; col=j; ures_get2dArrayItem( theBundle, tag, row, col, &status); - if(SUCCESS(status)) + if(U_SUCCESS(status)) string=ures_get2dArrayItem(theBundle, tag, row, col, &status); @@ -486,7 +486,7 @@ bool_t testTag(const char* frag, CONFIRM_ErrorCode(status,expected_status); - if (SUCCESS(status)) + if (U_SUCCESS(status)) { UChar element[3]; u_strcpy(expected_string,base); @@ -529,7 +529,7 @@ bool_t testTag(const char* frag, ures_getTaggedArrayItem( theBundle, tag, item_tag, &status); - if(SUCCESS(status)) + if(U_SUCCESS(status)) string=ures_getTaggedArrayItem(theBundle, tag, item_tag, &status); @@ -583,7 +583,7 @@ void TestFallback() log_verbose("Opening fr_FR.."); fr_FR = ures_open(NULL, "fr_FR", &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Couldn't open fr_FR - %d\n", status); return; diff --git a/icu4c/source/test/cintltst/cturtst.c b/icu4c/source/test/cintltst/cturtst.c index 0024c2f2f0f..46fccb4daa1 100644 --- a/icu4c/source/test/cintltst/cturtst.c +++ b/icu4c/source/test/cintltst/cturtst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /** * CollationTurkishTest is a third level test class. This tests the locale @@ -119,7 +119,7 @@ void TestTertiary( ) UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("tr", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing Turkish Collation with Tertiary strength\n"); @@ -138,7 +138,7 @@ void TestPrimary() UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("tr", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing Turkish Collation with Primary strength\n"); diff --git a/icu4c/source/test/cintltst/cucdtst.c b/icu4c/source/test/cintltst/cucdtst.c index d7fee0fc56f..874d7d55027 100644 --- a/icu4c/source/test/cintltst/cucdtst.c +++ b/icu4c/source/test/cintltst/cucdtst.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI, added tests for string functions +* Madhu Katragadda Ported for C API, added tests for string functions ********************************************************************************* */ #include "uchar.h" @@ -324,7 +324,7 @@ void TestUnicodeData() input = fopen(newPath, "r"); if (input == 0) { - log_err("Unicode CAPI test 'fopen' (%s) error\n", newPath); + log_err("Unicode C API test 'fopen' (%s) error\n", newPath); return; } @@ -335,30 +335,30 @@ void TestUnicodeData() if (bufferPtr[0] == '#' || bufferPtr[0] == '\n' || bufferPtr[0] == 0) continue; sscanf(bufferPtr, "%X", &unicode); if (!(0 <= unicode && unicode < 65536)) { - log_err("Unicode CAPI test precondition '(0 <= unicode && unicode < 65536)' failed\n"); + log_err("Unicode C API test precondition '(0 <= unicode && unicode < 65536)' failed\n"); return; } if (unicode == LAST_CHAR_CODE_IN_FILE) break; bufferPtr = strchr(bufferPtr, ';'); if (!(bufferPtr != NULL)) { - log_err("Unicode CAPI test condition '(bufferPtr != NULL)' failed\n"); + log_err("Unicode C API test condition '(bufferPtr != NULL)' failed\n"); return; } bufferPtr = strchr(bufferPtr + 1, ';'); /* go to start of third field */ if (!(bufferPtr != NULL)) { - log_err("Unicode CAPI test condition '(bufferPtr != NULL)' failed\n"); + log_err("Unicode C API test condition '(bufferPtr != NULL)' failed\n"); return; } dirPtr = bufferPtr; dirPtr = strchr(dirPtr + 1, ';'); if (!(dirPtr != NULL)) { - log_err("Unicode CAPI test precondition '(dirPtr != NULL)' failed\n"); + log_err("Unicode C API test precondition '(dirPtr != NULL)' failed\n"); return; } dirPtr = strchr(dirPtr + 1, ';'); if (!(dirPtr != NULL)) { - log_err("Unicode CAPI test precondition '(dirPtr != NULL)' failed\n"); + log_err("Unicode C API test precondition '(dirPtr != NULL)' failed\n"); return; } bufferPtr++; diff --git a/icu4c/source/test/cintltst/encoll.c b/icu4c/source/test/cintltst/encoll.c index 4f1ad019c0b..8aa036e096a 100644 --- a/icu4c/source/test/cintltst/encoll.c +++ b/icu4c/source/test/cintltst/encoll.c @@ -15,7 +15,7 @@ * * Modification History: * Name Description -* Madhu Katragadda Ported for CAPI +* Madhu Katragadda Ported for C API ********************************************************************************* /** * CollationEnglishTest is a third level test class. This tests the locale @@ -290,7 +290,7 @@ void TestTertiary( ) int32_t i,j; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("en_US", &status); - if(FAILURE(status)){ + if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); } log_verbose("Testing English Collation with Tertiary strength\n"); @@ -331,7 +331,7 @@ void TestPrimary() int32_t i; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("en_US", &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_DECOMP_CAN_COMP_COMPAT); @@ -350,7 +350,7 @@ void TestSecondary() int32_t i,j, testAcuteSize; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("en_US", &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); diff --git a/icu4c/source/test/cintltst/nccbtst.c b/icu4c/source/test/cintltst/nccbtst.c index f01dd1d5b7e..d640e4421d5 100644 --- a/icu4c/source/test/cintltst/nccbtst.c +++ b/icu4c/source/test/cintltst/nccbtst.c @@ -153,30 +153,30 @@ void TestSkip(int32_t inputsize, int32_t outputsize) /*From Unicode*/ if(!testConvertFromUnicode(sampleText, sizeof(sampleText)/sizeof(sampleText[0]), expskipIBM_949, sizeof(expskipIBM_949), "ibm-949", - (UCNV_FromUCallBack)MissingUnicodeAction_SKIP, toIBM949Offsskip )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SKIP, toIBM949Offsskip )) log_err("u-> ibm-949 with skip did not match.\n"); if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]), expskipIBM_943, sizeof(expskipIBM_943), "ibm-943", - (UCNV_FromUCallBack)MissingUnicodeAction_SKIP, toIBM943Offsskip )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SKIP, toIBM943Offsskip )) log_err("u-> ibm-943 with skip did not match.\n"); if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]), expskipIBM_930, sizeof(expskipIBM_930), "ibm-930", - (UCNV_FromUCallBack)MissingUnicodeAction_SKIP, toIBM930Offsskip )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SKIP, toIBM930Offsskip )) log_err("u-> ibm-930 with skip did not match.\n"); /*to Unicode*/ if(!testConvertToUnicode(expskipIBM_949, sizeof(expskipIBM_949), IBM_949skiptoUnicode, sizeof(IBM_949skiptoUnicode)/sizeof(IBM_949skiptoUnicode),"ibm-949", - (UCNV_ToUCallBack)MissingCharAction_SKIP, fromIBM949Offs )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SKIP, fromIBM949Offs )) log_err("ibm-949->u with skip did not match.\n"); if(!testConvertToUnicode(expskipIBM_943, sizeof(expskipIBM_943), IBM_943skiptoUnicode, sizeof(IBM_943skiptoUnicode)/sizeof(IBM_943skiptoUnicode[0]),"ibm-943", - (UCNV_ToUCallBack)MissingCharAction_SKIP, fromIBM943Offs )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SKIP, fromIBM943Offs )) log_err("ibm-943->u with skip did not match.\n"); if(!testConvertToUnicode(expskipIBM_930, sizeof(expskipIBM_930), IBM_930skiptoUnicode, sizeof(IBM_930skiptoUnicode)/sizeof(IBM_930skiptoUnicode[0]),"ibm-930", - (UCNV_ToUCallBack)MissingCharAction_SKIP, fromIBM930Offs )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SKIP, fromIBM930Offs )) log_err("ibm-930->u with skip did not match.\n"); } @@ -212,29 +212,29 @@ void TestSub(int32_t inputsize, int32_t outputsize) /*from unicode*/ if(!testConvertFromUnicode(sampleText, sizeof(sampleText)/sizeof(sampleText[0]), expsubIBM_949, sizeof(expsubIBM_949), "ibm-949", - (UCNV_FromUCallBack)MissingUnicodeAction_SUBSTITUTE, toIBM949Offssub )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SUBSTITUTE, toIBM949Offssub )) log_err("u-> ibm-949 with subst did not match.\n"); if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]), expsubIBM_943, sizeof(expsubIBM_943), "ibm-943", - (UCNV_FromUCallBack)MissingUnicodeAction_SUBSTITUTE, toIBM943Offssub )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SUBSTITUTE, toIBM943Offssub )) log_err("u-> ibm-943 with subst did not match.\n"); if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]), expsubIBM_930, sizeof(expsubIBM_930), "ibm-930", - (UCNV_FromUCallBack)MissingUnicodeAction_SUBSTITUTE, toIBM930Offssub )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SUBSTITUTE, toIBM930Offssub )) log_err("u-> ibm-930 with subst did not match.\n"); /*to unicode*/ if(!testConvertToUnicode(expsubIBM_949, sizeof(expsubIBM_949), IBM_949subtoUnicode, sizeof(IBM_949subtoUnicode)/sizeof(IBM_949subtoUnicode[0]),"ibm-949", - (UCNV_ToUCallBack)MissingCharAction_SUBSTITUTE, fromIBM949Offs )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM949Offs )) log_err("ibm-949->u with substitute did not match.\n"); if(!testConvertToUnicode(expsubIBM_943, sizeof(expsubIBM_943), IBM_943subtoUnicode, sizeof(IBM_943subtoUnicode)/sizeof(IBM_943subtoUnicode[0]),"ibm-943", - (UCNV_ToUCallBack)MissingCharAction_SUBSTITUTE, fromIBM943Offs )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM943Offs )) log_err("ibm-943->u with substitute did not match.\n"); if(!testConvertToUnicode(expsubIBM_930, sizeof(expsubIBM_930), IBM_930subtoUnicode, sizeof(IBM_930subtoUnicode)/sizeof(IBM_930subtoUnicode[0]),"ibm-930", - (UCNV_ToUCallBack)MissingCharAction_SUBSTITUTE, fromIBM930Offs )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM930Offs )) log_err("ibm-930->u with substitute did not match.\n"); } @@ -271,23 +271,23 @@ void TestSubWithValue(int32_t inputsize, int32_t outputsize) /*from Unicode*/ if(!testConvertFromUnicode(sampleText, sizeof(sampleText)/sizeof(sampleText[0]), expsubwvalIBM_949, sizeof(expsubwvalIBM_949), "ibm-949", - (UCNV_FromUCallBack)MissingUnicodeAction_SUBSTITUTEwithValue, toIBM949Offs )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_ESCAPE, toIBM949Offs )) log_err("u-> ibm-949 with subst with value did not match.\n"); if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]), expsubwvalIBM_943, sizeof(expsubwvalIBM_943), "ibm-943", - (UCNV_FromUCallBack)MissingUnicodeAction_SUBSTITUTEwithValue, toIBM943Offs )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_ESCAPE, toIBM943Offs )) log_err("u-> ibm-943 with sub with value did not match.\n"); if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]), expsubwvalIBM_930, sizeof(expsubwvalIBM_930), "ibm-930", - (UCNV_FromUCallBack)MissingUnicodeAction_SUBSTITUTEwithValue, toIBM930Offs )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_ESCAPE, toIBM930Offs )) log_err("u-> ibm-930 with subst with value did not match.\n"); /*to Unicode*/ if(!testConvertToUnicode(sampleTxtToU, sizeof(sampleTxtToU), IBM_943toUnicode, sizeof(IBM_943toUnicode)/sizeof(IBM_943toUnicode),"ibm-943", - (UCNV_ToUCallBack)MissingCharAction_SUBSTITUTEwithValue, fromIBM943Offs )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_ESCAPE, fromIBM943Offs )) log_err("ibm-943->u with substitute did not match.\n"); } void TestLegalAndOthers(int32_t inputsize, int32_t outputsize) @@ -312,24 +312,24 @@ void TestLegalAndOthers(int32_t inputsize, int32_t outputsize) /*checking with a legal value*/ if(!testConvertFromUnicode(legalText, sizeof(legalText)/sizeof(legalText[0]), templegal949, sizeof(templegal949), "ibm-949", - (UCNV_FromUCallBack)MissingUnicodeAction_SKIP, to949legal )) + (UConverterFromUCallback)UCNV_FROM_U_CALLBACK_SKIP, to949legal )) log_err("u-> ibm-949 with skip did not match.\n"); /*checking illegal value for ibm-943 with substitute*/ if(!testConvertToUnicode(text943, sizeof(text943), toUnicode943sub, sizeof(toUnicode943sub)/sizeof(toUnicode943sub[0]),"ibm-943", - (UCNV_ToUCallBack)MissingCharAction_SUBSTITUTE, fromIBM943Offssub )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM943Offssub )) log_err("ibm-943->u with subst did not match.\n"); /*checking illegal value for ibm-943 with skip */ if(!testConvertToUnicode(text943, sizeof(text943), toUnicode943skip, sizeof(toUnicode943skip)/sizeof(toUnicode943skip[0]),"ibm-943", - (UCNV_ToUCallBack)MissingCharAction_SKIP, fromIBM943Offsskip )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SKIP, fromIBM943Offsskip )) log_err("ibm-943->u with skip did not match.\n"); /*checking illegal value for ibm-943 with stop */ if(!testConvertToUnicode(text943, sizeof(text943), toUnicode943stop, sizeof(toUnicode943stop)/sizeof(toUnicode943stop[0]),"ibm-943", - (UCNV_ToUCallBack)MissingCharAction_STOP, fromIBM943Offsstop )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_STOP, fromIBM943Offsstop )) log_err("ibm-943->u with stop did not match.\n"); } @@ -344,12 +344,12 @@ void TestSingleByte(int32_t inputsize, int32_t outputsize) if(!testConvertToUnicode(sampleText, sizeof(sampleText), toUnicode943sub, sizeof(toUnicode943sub)/sizeof(toUnicode943sub[0]),"ibm-943", - (UCNV_ToUCallBack)MissingCharAction_SUBSTITUTE, fromIBM943Offssub )) + (UConverterToUCallback)UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM943Offssub )) log_err("ibm-943->u with subst did not match.\n"); } bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *expect, int expectLen, - const char *codepage, UCNV_FromUCallBack callback , int32_t *expectOffsets) + const char *codepage, UConverterFromUCallback callback , int32_t *expectOffsets) { @@ -368,7 +368,7 @@ bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *e const UChar *sourceLimit; bool_t checkOffsets = TRUE; bool_t doFlush; - UCNV_FromUCallBack action; + UConverterFromUCallback action; char junk[9999]; char offset_str[9999]; char expOff[9999]; @@ -385,7 +385,7 @@ bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *e gOutBufferSize); conv = ucnv_open(codepage, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Couldn't open converter %s\n",codepage); return FALSE; @@ -396,7 +396,7 @@ bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *e ucnv_setFromUCallBack (conv, /*action*/callback, &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err("FAILURE in setting the callback Function! %s\n", myErrorName(status)); } @@ -444,7 +444,7 @@ bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *e } while ( (status == U_INDEX_OUTOFBOUNDS_ERROR) || (sourceLimit < realSourceEnd) ); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Problem tdoing fromUnicode, errcode %d %s\n", myErrorName(status), gNuConvTestName); return FALSE; @@ -516,7 +516,7 @@ bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *e } bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *expect, int expectlen, - const char *codepage, UCNV_ToUCallBack callback, int32_t *expectOffsets) + const char *codepage, UConverterToUCallback callback, int32_t *expectOffsets) { UErrorCode status = U_ZERO_ERROR; UConverter *conv = 0; @@ -533,7 +533,7 @@ bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *exp char junk[9999]; char offset_str[9999]; UChar *p; - UCNV_ToUCallBack action; + UConverterToUCallback action; int32_t realBufferSize; UChar *realBufferEnd; @@ -550,7 +550,7 @@ bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *exp log_verbose("\n========= %s\n", gNuConvTestName); conv = ucnv_open(codepage, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Couldn't open converter %s\n",gNuConvTestName); return FALSE; @@ -569,7 +569,7 @@ bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *exp ucnv_setToUCallBack (conv, callback, &status); - if (FAILURE(status)) + if (U_FAILURE(status)) { log_err("FAILURE in setting the callback Function! %s\n", myErrorName(status)); } @@ -631,7 +631,7 @@ bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *exp } } - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Problem doing toUnicode, errcode %d %s\n", myErrorName(status), gNuConvTestName); return FALSE; diff --git a/icu4c/source/test/cintltst/nucnvtst.c b/icu4c/source/test/cintltst/nucnvtst.c index 4b9eccbc177..a9a0346ee03 100644 --- a/icu4c/source/test/cintltst/nucnvtst.c +++ b/icu4c/source/test/cintltst/nucnvtst.c @@ -153,7 +153,7 @@ bool_t testConvertFromU( const UChar *source, int sourceLen, const char *expect log_verbose("\n========= %s\n", gNuConvTestName); conv = ucnv_open(codepage, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Couldn't open converter %s\n",codepage); return FALSE; @@ -203,7 +203,7 @@ bool_t testConvertFromU( const UChar *source, int sourceLen, const char *expect } while ( (status == U_INDEX_OUTOFBOUNDS_ERROR) || (sourceLimit < realSourceEnd) ); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Problem tdoing fromUnicode, errcode %d %s\n", codepage, status, gNuConvTestName); return FALSE; @@ -297,7 +297,7 @@ bool_t testConvertToU( const char *source, int sourcelen, const UChar *expect, i log_verbose("\n========= %s\n", gNuConvTestName); conv = ucnv_open(codepage, &status); - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Couldn't open converter %s\n",gNuConvTestName); return FALSE; @@ -348,7 +348,7 @@ bool_t testConvertToU( const char *source, int sourcelen, const UChar *expect, i } while ( (status == U_INDEX_OUTOFBOUNDS_ERROR) || (srcLimit < realSourceEnd) ); /* while we just need another buffer */ - if(FAILURE(status)) + if(U_FAILURE(status)) { log_err("Problem doing toUnicode, errcode %d %s\n", status, gNuConvTestName); return FALSE; @@ -501,7 +501,7 @@ void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize ) if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]), expectedIBM943, sizeof(expectedIBM943), "ibm-943", toIBM943Offs )) - log_err("u-> ibm-943 [MBCS] not match.\n"); + log_err("u-> ibm-943 [UCNV_MBCS] not match.\n"); if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]), expectedUTF16LE, sizeof(expectedUTF16LE), "utf-16le", toUTF16LEOffs )) @@ -572,17 +572,17 @@ void TestConverterTypesAndStarters() log_verbose("Testing KSC, ibm-930, ibm-878 for starters and their conversion types."); myConverter[0] = ucnv_open("ksc", &err); - if (FAILURE(err)) log_err("Failed to create an ibm-949 converter\n"); + if (U_FAILURE(err)) log_err("Failed to create an ibm-949 converter\n"); myConverter[1] = ucnv_open("ibm-930", &err); - if (FAILURE(err)) log_err("Failed to create an ibm-930 converter\n"); + if (U_FAILURE(err)) log_err("Failed to create an ibm-930 converter\n"); myConverter[2] = ucnv_open("ibm-878", &err); - if (FAILURE(err)) log_err("Failed to create an ibm-815 converter\n"); + if (U_FAILURE(err)) log_err("Failed to create an ibm-815 converter\n"); - if (ucnv_getType(myConverter[0])!=MBCS) log_err("ucnv_getType Failed for ibm-949\n"); + if (ucnv_getType(myConverter[0])!=UCNV_MBCS) log_err("ucnv_getType Failed for ibm-949\n"); else log_verbose("ucnv_getType ibm-949 ok\n"); - if (ucnv_getType(myConverter[1])!=EBCDIC_STATEFUL) log_err("ucnv_getType Failed for ibm-930\n"); + if (ucnv_getType(myConverter[1])!=UCNV_EBCDIC_STATEFUL) log_err("ucnv_getType Failed for ibm-930\n"); else log_verbose("ucnv_getType ibm-930 ok\n"); - if (ucnv_getType(myConverter[2])!=SBCS) log_err("ucnv_getType Failed for ibm-815\n"); + if (ucnv_getType(myConverter[2])!=UCNV_SBCS) log_err("ucnv_getType Failed for ibm-815\n"); else log_verbose("ucnv_getType ibm-815 ok\n"); diff --git a/icu4c/source/test/cintltst/susctest.c b/icu4c/source/test/cintltst/susctest.c index fd91ffedbb2..1d78cb175ff 100644 --- a/icu4c/source/test/cintltst/susctest.c +++ b/icu4c/source/test/cintltst/susctest.c @@ -432,7 +432,7 @@ myTest(const UChar *chars, myCSource + len, &status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { printf("Failing status code at line %d.\n", __LINE__); exit(1); } @@ -452,7 +452,7 @@ myTest(const UChar *chars, myDSource + myByteCount, &status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { printf("Failing status code at line %d.\n", __LINE__); exit(1); } @@ -536,7 +536,7 @@ myMultipassTest(const UChar *chars, chars + len, &status); - if(status != U_INDEX_OUTOFBOUNDS_ERROR && FAILURE(status)) { + if(status != U_INDEX_OUTOFBOUNDS_ERROR && U_FAILURE(status)) { printf("Failing status code at line %d.\n", __LINE__); exit(1); } @@ -575,7 +575,7 @@ myMultipassTest(const UChar *chars, myCompressed + totalBytesWritten, &status); - if(status != U_INDEX_OUTOFBOUNDS_ERROR && FAILURE(status)) { + if(status != U_INDEX_OUTOFBOUNDS_ERROR && U_FAILURE(status)) { printf("Failing status code at line %d.\n", __LINE__); exit(1); } diff --git a/icu4c/source/test/intltest/allcoll.cpp b/icu4c/source/test/intltest/allcoll.cpp index 607136774fd..ce0cf51a90f 100644 --- a/icu4c/source/test/intltest/allcoll.cpp +++ b/icu4c/source/test/intltest/allcoll.cpp @@ -396,7 +396,7 @@ void CollationDummyTest::doTest( UnicodeString source, UnicodeString target, Col UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; diff --git a/icu4c/source/test/intltest/apicoll.cpp b/icu4c/source/test/intltest/apicoll.cpp index 9448731efd2..572d10212ec 100644 --- a/icu4c/source/test/intltest/apicoll.cpp +++ b/icu4c/source/test/intltest/apicoll.cpp @@ -76,7 +76,7 @@ CollationAPITest::TestProperty( char* par ) logln("Test ctors : "); col = Collator::createInstance(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Default Collator creation failed."); return; @@ -134,7 +134,7 @@ CollationAPITest::TestProperty( char* par ) delete col; col = 0; col = Collator::createInstance(Locale::FRENCH, success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Creating French collation failed."); return; @@ -157,7 +157,7 @@ CollationAPITest::TestProperty( char* par ) Collator *junk = 0; junk = Collator::createInstance(abcd, success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Junk collation creation failed, should at least return default."); delete col; @@ -166,7 +166,7 @@ CollationAPITest::TestProperty( char* par ) delete col; col = Collator::createInstance(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Creating default collator failed."); delete junk; @@ -175,7 +175,7 @@ CollationAPITest::TestProperty( char* par ) doAssert((*col == *junk), "The default collation should be returned."); Collator *frCol = Collator::createInstance(Locale::FRANCE, success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Creating French collator failed."); delete col; delete junk; @@ -200,7 +200,7 @@ CollationAPITest::TestHashCode( char* par ) UErrorCode success = U_ZERO_ERROR; Collator *col1 = 0; col1 = Collator::createInstance(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Default collation creation failed."); return; @@ -209,7 +209,7 @@ CollationAPITest::TestHashCode( char* par ) Collator *col2 = 0; Locale dk("da", "DK", ""); col2 = Collator::createInstance(dk, success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Danish collation creation failed."); return; @@ -217,7 +217,7 @@ CollationAPITest::TestHashCode( char* par ) Collator *col3 = 0; col3 = Collator::createInstance(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("2nd default collation creation failed."); return; @@ -245,7 +245,7 @@ CollationAPITest::TestCollationKey( char* par ) Collator *col = 0; UErrorCode success = U_ZERO_ERROR; col = Collator::createInstance(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Default collation creation failed."); return; @@ -329,7 +329,7 @@ CollationAPITest::TestElemIter( char* par ) Collator *col = 0; UErrorCode success = U_ZERO_ERROR; col = Collator::createInstance(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Default collation creation failed."); return; @@ -347,7 +347,7 @@ CollationAPITest::TestElemIter( char* par ) doAssert((*iterator1 == *iterator2), "The two iterators should be the same"); doAssert((*iterator1 != *iterator3), "The two iterators should be different"); order1 = iterator1->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -355,7 +355,7 @@ CollationAPITest::TestElemIter( char* par ) doAssert((*iterator1 != *iterator2), "The first iterator advance failed"); order2 = iterator2->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -364,7 +364,7 @@ CollationAPITest::TestElemIter( char* par ) doAssert((*iterator1 == *iterator2), "The second iterator advance failed"); doAssert((order1 == order2), "The order result should be the same"); order3 = iterator3->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -378,7 +378,7 @@ CollationAPITest::TestElemIter( char* par ) CollationElementIterator::tertiaryOrder(order3)), "The tertiary orders should be the same"); order1 = iterator1->next(success); order3 = iterator3->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -396,7 +396,7 @@ CollationAPITest::TestElemIter( char* par ) iterator1->reset(); iterator2->reset(); iterator3->reset(); order1 = iterator1->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -405,7 +405,7 @@ CollationAPITest::TestElemIter( char* par ) doAssert((*iterator1 != *iterator2), "The first iterator advance failed"); order2 = iterator2->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -415,7 +415,7 @@ CollationAPITest::TestElemIter( char* par ) doAssert((order1 == order2), "The order result should be the same"); order3 = iterator3->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -429,7 +429,7 @@ CollationAPITest::TestElemIter( char* par ) CollationElementIterator::tertiaryOrder(order3)), "The tertiary orders should be the same"); order1 = iterator1->next(success); order2 = iterator2->next(success); order3 = iterator3->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -441,7 +441,7 @@ CollationAPITest::TestElemIter( char* par ) CollationElementIterator::tertiaryOrder(order3)), "The tertiary orders should be different"); order1 = iterator1->next(success); order3 = iterator3->next(success); - if (FAILURE(success)) + if (U_FAILURE(success)) { errln("Somehow ran out of memory stepping through the iterator."); return; @@ -468,13 +468,13 @@ CollationAPITest::TestOperators( char* par ) UnicodeString ruleset1("< a, A < b, B < c, C; ch, cH, Ch, CH < d, D, e, E"); UnicodeString ruleset2("< a, A < b, B < c, C < d, D, e, E"); RuleBasedCollator *col1 = new RuleBasedCollator(ruleset1, success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { errln("RuleBasedCollator creation failed."); return; } success = U_ZERO_ERROR; RuleBasedCollator *col2 = new RuleBasedCollator(ruleset2, success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { errln("The RuleBasedCollator constructor failed when building with the 2nd rule set."); return; } @@ -486,7 +486,7 @@ CollationAPITest::TestOperators( char* par ) success = U_ZERO_ERROR; Collator *col3 = Collator::createInstance(success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { errln("Default collation creation failed."); return; } @@ -500,7 +500,7 @@ CollationAPITest::TestOperators( char* par ) const UnicodeString& defRules = ((RuleBasedCollator*)col3)->getRules(); RuleBasedCollator* col6 = new RuleBasedCollator(defRules, success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { errln("Creating default collation with rules failed."); return; } @@ -521,7 +521,7 @@ CollationAPITest::TestDuplicate( char* par ) { UErrorCode status = U_ZERO_ERROR; Collator *col1 = Collator::createInstance(status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { logln("Default collator creation failed."); return; } @@ -544,7 +544,7 @@ CollationAPITest::TestCompare( char* par ) Collator *col = 0; UErrorCode success = U_ZERO_ERROR; col = Collator::createInstance(success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { errln("Default collation creation failed."); return; } diff --git a/icu4c/source/test/intltest/callimts.cpp b/icu4c/source/test/intltest/callimts.cpp index d7966b03d8b..8e482794e47 100644 --- a/icu4c/source/test/intltest/callimts.cpp +++ b/icu4c/source/test/intltest/callimts.cpp @@ -54,7 +54,7 @@ CalendarLimitTest::test(UDate millis, Calendar* cal, DateFormat* fmt) UErrorCode status = U_ZERO_ERROR; UDate d = millis; cal->setTime(millis, exception); - if (SUCCESS(exception)) { + if (U_SUCCESS(exception)) { fmt->format(millis, theDate); UDate dt = fmt->parse(theDate, status); // allow a small amount of error (drift) diff --git a/icu4c/source/test/intltest/calregts.cpp b/icu4c/source/test/intltest/calregts.cpp index c1a485e2379..3d7effb3297 100644 --- a/icu4c/source/test/intltest/calregts.cpp +++ b/icu4c/source/test/intltest/calregts.cpp @@ -79,7 +79,7 @@ CalendarRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, bool_t CalendarRegressionTest::failure(UErrorCode status, const char* msg) { - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; } @@ -174,7 +174,7 @@ CalendarRegressionTest::test4031502() failure(status, "new GregorianCalendar"); cal->clear(); cal->set(1900, 15, 5, 5, 8, 13); - if (cal->get(Calendar::HOUR, status) != 5 || FAILURE(status)) { + if (cal->get(Calendar::HOUR, status) != 5 || U_FAILURE(status)) { UnicodeString temp; logln(zone->getID(temp) + " " + //zone.useDaylightTime() + " " + @@ -260,7 +260,7 @@ CalendarRegressionTest::test4031502() cal->set(Calendar::DAY_OF_WEEK, 0); //try { cal->getTime(status); - if( ! FAILURE(status)) + if( ! U_FAILURE(status)) errln("Fail: DAY_OF_WEEK 0 should be disallowed"); /*} catch (IllegalArgumentException e) { @@ -1106,7 +1106,7 @@ CalendarRegressionTest::test4031502() cal->set(Calendar::MONTH, Calendar::FEBRUARY); cal->set(Calendar::DATE, 28); cal->add(Calendar::DATE, 1,status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("add(DATE,1) failed"); if (cal->get(Calendar::DATE,status) != 29 || !cal->isLeapYear(-80)) // -80 == 81 BC @@ -1149,7 +1149,7 @@ CalendarRegressionTest::test4031502() GregorianCalendar *calendar = new GregorianCalendar(status); //try { calendar->roll((Calendar::EDateFields)-1, TRUE, status); - if(SUCCESS(status)) + if(U_SUCCESS(status)) errln("Test failed, no exception thrown"); //} //catch (IllegalArgumentException e) { @@ -1269,7 +1269,7 @@ CalendarRegressionTest::test4031502() calendar->getTime(status); // Force time computation // We expect an exception to be thrown. If we fall through // to the next line, then we have a bug. - if(SUCCESS(status)) + if(U_SUCCESS(status)) errln(UnicodeString("Test failed with field ") + fieldName[field] + ", date before: " + date + ", date after: " + calendar->getTime(status) + @@ -1296,7 +1296,7 @@ CalendarRegressionTest::Test4149677() TimeZone::createTimeZone("PST"), TimeZone::createTimeZone("EAT") }; - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create zones"); return; // could leak memory @@ -1304,27 +1304,27 @@ CalendarRegressionTest::Test4149677() for (int32_t i=0; i < 3; ++i) { GregorianCalendar *calendar = new GregorianCalendar(zones[i], status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldnt' create calendar."); return; } // Make sure extreme values don't wrap around calendar->setTime(EARLIEST_SUPPORTED_MILLIS, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("setTime failed"); - if (calendar->get(Calendar::ERA, status) != GregorianCalendar::BC || FAILURE(status)) { + if (calendar->get(Calendar::ERA, status) != GregorianCalendar::BC || U_FAILURE(status)) { errln("Fail: Date(EARLIEST_SUPPORTED_MILLIS) has an AD year"); } calendar->setTime(LATEST_SUPPORTED_MILLIS, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("setTime failed"); - if (calendar->get(Calendar::ERA, status) != GregorianCalendar::AD || FAILURE(status)) { + if (calendar->get(Calendar::ERA, status) != GregorianCalendar::AD || U_FAILURE(status)) { errln("Fail: Date(LATEST_SUPPORTED_MILLIS) has a BC year"); } calendar->setGregorianChange(LATEST_SUPPORTED_MILLIS, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("setGregorianChange failed"); // to obtain a pure Julian calendar @@ -1354,7 +1354,7 @@ CalendarRegressionTest::Test4162587() TimeZone::adoptDefault(tz); GregorianCalendar *cal = new GregorianCalendar(tz, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create calendar"); return; } @@ -1366,7 +1366,7 @@ CalendarRegressionTest::Test4162587() cal->clear(); cal->set(1998, Calendar::APRIL, 5, i, 0); d0 = cal->getTime(status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Coudln't get time (1)"); //String s0 = d.toString(); logln(UnicodeString("0 ") + i + ": " + d0/*s0*/); @@ -1374,7 +1374,7 @@ CalendarRegressionTest::Test4162587() cal->clear(); cal->set(1998, Calendar::APRIL, 4, i+24, 0); dPlus = cal->getTime(status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Coudln't get time (2)"); //String sPlus = d.toString(); logln(UnicodeString("+ ") + i + ": " + dPlus/*sPlus*/); @@ -1382,7 +1382,7 @@ CalendarRegressionTest::Test4162587() cal->clear(); cal->set(1998, Calendar::APRIL, 6, i-24, 0); dMinus = cal->getTime(status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Coudln't get time (3)"); //String sMinus = d.toString(); logln(UnicodeString("- ") + i + ": " + dMinus/*sMinus*/); @@ -1402,29 +1402,29 @@ CalendarRegressionTest::Test4165343() { UErrorCode status = U_ZERO_ERROR; GregorianCalendar *calendar = new GregorianCalendar(1996, Calendar::FEBRUARY, 29, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create calendar"); return; } UDate start = calendar->getTime(status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't getTime (1)"); logln(UnicodeString("init date: ") + start); calendar->add(Calendar::MONTH, 12, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't add(MONTH, 12)"); UDate date1 = calendar->getTime(status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't getTime (2)"); logln(UnicodeString("after adding 12 months: ") + date1); calendar->setTime(start, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't setTime"); calendar->add(Calendar::YEAR, 1, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't add(YEAR, 1)"); UDate date2 = calendar->getTime(status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't getTime (3)"); logln(UnicodeString("after adding one year : ") + date2); if (date1 == date2) { @@ -1457,7 +1457,7 @@ CalendarRegressionTest::Test4166109() Calendar::EDateFields field = Calendar::WEEK_OF_MONTH; GregorianCalendar *calendar = new GregorianCalendar(Locale::US, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create calendar"); return; } @@ -1466,7 +1466,7 @@ CalendarRegressionTest::Test4166109() logln(UnicodeString("Date: ") + calendar->getTime(status)); int32_t firstInMonth = calendar->get(Calendar::DAY_OF_MONTH, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("get(D_O_M) failed"); for(int32_t firstInWeek = Calendar::SUNDAY; firstInWeek <= Calendar::SATURDAY; firstInWeek++) { @@ -1501,7 +1501,7 @@ CalendarRegressionTest::Test4167060() Calendar::EDateFields field = Calendar::YEAR; DateFormat *format = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy G", Locale::US, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create SimpleDateFormat"); return; } @@ -1511,7 +1511,7 @@ CalendarRegressionTest::Test4167060() new GregorianCalendar(-99 /*100BC*/, Calendar::JANUARY, 1, status), new GregorianCalendar(1996, Calendar::FEBRUARY, 29, status), }; - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create GregorianCalendars"); return; // could leak @@ -1531,12 +1531,12 @@ CalendarRegressionTest::Test4167060() calendar->setGregorianChange(LATEST_SUPPORTED_MILLIS, status); } - if(FAILURE(status)) + if(U_FAILURE(status)) errln("setGregorianChange() failed"); format->adoptCalendar((Calendar*)calendar->clone()); UDate dateBefore = calendar->getTime(status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("getTime() failed"); int32_t maxYear = calendar->getActualMaximum(field); @@ -1551,13 +1551,13 @@ CalendarRegressionTest::Test4167060() bool_t valid = years[i] <= maxYear; calendar->set(field, years[i]); UDate dateAfter = calendar->getTime(status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("getTime() failed"); int32_t newYear = calendar->get(field, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln(UnicodeString("get(") + (int32_t)field + ") failed"); calendar->setTime(dateBefore, status); // restore calendar for next use - if(FAILURE(status)) + if(U_FAILURE(status)) errln("setTime() failed"); temp.remove(); @@ -1592,7 +1592,7 @@ void CalendarRegressionTest::Test4197699() { SimpleDateFormat fmt("E dd MMM yyyy 'DOY='D 'WOY='w", Locale::US, status); fmt.setCalendar(cal); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Couldn't initialize test"); return; } @@ -1622,7 +1622,7 @@ void CalendarRegressionTest::Test4197699() { logln(dfmt.format(cal.getTime(status), str.remove())); } } - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("FAIL: Unexpected error from Calendar"); return; } diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp index 8e9b8230a12..34b1cec4052 100644 --- a/icu4c/source/test/intltest/caltest.cpp +++ b/icu4c/source/test/intltest/caltest.cpp @@ -173,21 +173,21 @@ CalendarTest::TestGenericAPI() if (!cal->equals(*cal2, status) || cal->before(*cal2, status) || cal->after(*cal2, status) || - FAILURE(status)) errln("FAIL: equals/before/after failed"); + U_FAILURE(status)) errln("FAIL: equals/before/after failed"); cal2->setTime(when + 1000, status); if (failure(status, "Calendar::setTime")) return; if (cal->equals(*cal2, status) || cal2->before(*cal, status) || cal->after(*cal2, status) || - FAILURE(status)) errln("FAIL: equals/before/after failed"); + U_FAILURE(status)) errln("FAIL: equals/before/after failed"); cal->roll(Calendar::SECOND, (bool_t) TRUE, status); if (failure(status, "Calendar::roll")) return; if (!cal->equals(*cal2, status) || cal->before(*cal2, status) || cal->after(*cal2, status) || - FAILURE(status)) errln("FAIL: equals/before/after failed"); + U_FAILURE(status)) errln("FAIL: equals/before/after failed"); // Roll back to January cal->roll(Calendar::MONTH, (int32_t)(1 + Calendar::DECEMBER - cal->get(Calendar::MONTH, status)), status); @@ -195,7 +195,7 @@ CalendarTest::TestGenericAPI() if (cal->equals(*cal2, status) || cal2->before(*cal, status) || cal->after(*cal2, status) || - FAILURE(status)) errln("FAIL: equals/before/after failed"); + U_FAILURE(status)) errln("FAIL: equals/before/after failed"); TimeZone *z = cal->orphanTimeZone(); if (z->getID(str) != tzid || @@ -236,17 +236,17 @@ CalendarTest::TestGenericAPI() cal->adoptTimeZone(TimeZone::createDefault()); cal->clear(); cal->set(1984, 5, 24); - if (cal->getTime(status) != date(84, 5, 24) || FAILURE(status)) + if (cal->getTime(status) != date(84, 5, 24) || U_FAILURE(status)) errln("FAIL: Calendar::set(3 args) failed"); cal->clear(); cal->set(1985, 3, 2, 11, 49); - if (cal->getTime(status) != date(85, 3, 2, 11, 49) || FAILURE(status)) + if (cal->getTime(status) != date(85, 3, 2, 11, 49) || U_FAILURE(status)) errln("FAIL: Calendar::set(5 args) failed"); cal->clear(); cal->set(1995, 9, 12, 1, 39, 55); - if (cal->getTime(status) != date(95, 9, 12, 1, 39, 55) || FAILURE(status)) + if (cal->getTime(status) != date(95, 9, 12, 1, 39, 55) || U_FAILURE(status)) errln("FAIL: Calendar::set(6 args) failed"); cal->getTime(status); @@ -312,12 +312,12 @@ CalendarTest::TestGenericAPI() delete gc; gc = new GregorianCalendar(1998, 10, 14, 21, 43, status); - if (gc->getTime(status) != date(98, 10, 14, 21, 43) || FAILURE(status)) + if (gc->getTime(status) != date(98, 10, 14, 21, 43) || U_FAILURE(status)) errln("FAIL: new GregorianCalendar(ymdhm) failed"); delete gc; gc = new GregorianCalendar(1998, 10, 14, 21, 43, 55, status); - if (gc->getTime(status) != date(98, 10, 14, 21, 43, 55) || FAILURE(status)) + if (gc->getTime(status) != date(98, 10, 14, 21, 43, 55) || U_FAILURE(status)) errln("FAIL: new GregorianCalendar(ymdhms) failed"); GregorianCalendar gc2(Locale::ENGLISH, status); @@ -339,7 +339,7 @@ CalendarTest::TestRog() { UErrorCode status = U_ZERO_ERROR; GregorianCalendar* gc = new GregorianCalendar(status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } int32_t year = 1997, month = Calendar::APRIL, date = 1; gc->set(year, month, date); gc->set(Calendar::HOUR_OF_DAY, 23); @@ -347,11 +347,11 @@ CalendarTest::TestRog() gc->set(Calendar::SECOND, 0); gc->set(Calendar::MILLISECOND, 0); for (int32_t i = 0; i < 9; i++, gc->add(Calendar::DATE, 1, status)) { - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } if (gc->get(Calendar::YEAR, status) != year || gc->get(Calendar::MONTH, status) != month || gc->get(Calendar::DATE, status) != (date + i)) errln("FAIL: Date wrong"); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } } delete gc; } @@ -373,14 +373,14 @@ void CalendarTest::dowTest(bool_t lenient) { UErrorCode status = U_ZERO_ERROR; GregorianCalendar* cal = new GregorianCalendar(status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } cal->set(1997, Calendar::AUGUST, 12); cal->getTime(status); - if (FAILURE(status)) { errln("Calendar::getTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); return; } cal->setLenient(lenient); cal->set(1996, Calendar::DECEMBER, 1); int32_t dow = cal->get(Calendar::DAY_OF_WEEK, status); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } int32_t min = cal->getMinimum(Calendar::DAY_OF_WEEK); int32_t max = cal->getMaximum(Calendar::DAY_OF_WEEK); if (dow < min || @@ -401,7 +401,7 @@ CalendarTest::TestClonesUnique908() { UErrorCode status = U_ZERO_ERROR; Calendar *c = Calendar::createInstance(status); - if (FAILURE(status)) { errln("Calendar::createInstance failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::createInstance failed"); return; } Calendar *d = (Calendar*) c->clone(); c->set(Calendar::MILLISECOND, 123); d->set(Calendar::MILLISECOND, 456); @@ -409,7 +409,7 @@ CalendarTest::TestClonesUnique908() d->get(Calendar::MILLISECOND, status) != 456) { errln("FAIL: Clones share fields"); } - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } delete c; delete d; } @@ -426,13 +426,13 @@ CalendarTest::TestGregorianChange768() UErrorCode status = U_ZERO_ERROR; UnicodeString str; GregorianCalendar* c = new GregorianCalendar(status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } logln(UnicodeString("With cutoff ") + dateToString(c->getGregorianChange(), str)); logln(UnicodeString(" isLeapYear(1800) = ") + ((b = c->isLeapYear(1800)) ? "true" : "false")); logln(UnicodeString(" (should be FALSE)")); if (b) errln("FAIL"); c->setGregorianChange(date(0, 0, 1), status); - if (FAILURE(status)) { errln("GregorianCalendar::setGregorianChange failed"); return; } + if (U_FAILURE(status)) { errln("GregorianCalendar::setGregorianChange failed"); return; } logln(UnicodeString("With cutoff ") + dateToString(c->getGregorianChange(), str)); logln(UnicodeString(" isLeapYear(1800) = ") + ((b = c->isLeapYear(1800)) ? "true" : "false")); logln(UnicodeString(" (should be TRUE)")); @@ -450,7 +450,7 @@ CalendarTest::TestDisambiguation765() { UErrorCode status = U_ZERO_ERROR; Calendar *c = Calendar::createInstance(status); - if (FAILURE(status)) { errln("Calendar::createInstance failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::createInstance failed"); return; } c->setLenient(FALSE); c->clear(); c->set(Calendar::YEAR, 1997); @@ -546,13 +546,13 @@ CalendarTest::verify765(const UnicodeString& msg, Calendar* c, int32_t year, int if (c->get(Calendar::YEAR, status) == year && c->get(Calendar::MONTH, status) == month && c->get(Calendar::DATE, status) == day) { - if (FAILURE(status)) { errln("FAIL: Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("FAIL: Calendar::get failed"); return; } logln("PASS: " + msg + dateToString(c->getTime(status), str)); - if (FAILURE(status)) { errln("Calendar::getTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); return; } } else { errln("FAIL: " + msg + dateToString(c->getTime(status), str) + "; expected " + (int32_t)year + "/" + (int32_t)(month + 1) + "/" + (int32_t)day); - if (FAILURE(status)) { errln("Calendar::getTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); return; } } } @@ -586,30 +586,30 @@ CalendarTest::test4064654(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_ UErrorCode status = U_ZERO_ERROR; UnicodeString str; Calendar *gmtcal = Calendar::createInstance(status); - if (FAILURE(status)) { errln("Calendar::createInstance failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::createInstance failed"); return; } gmtcal->adoptTimeZone(TimeZone::createTimeZone("Africa/Casablanca")); gmtcal->set(yr, mo - 1, dt, hr, mn, sc); gmtcal->set(Calendar::MILLISECOND, 0); date = gmtcal->getTime(status); - if (FAILURE(status)) { errln("Calendar::getTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); return; } logln("date = " + dateToString(date, str)); Calendar *cal = Calendar::createInstance(status); - if (FAILURE(status)) { errln("Calendar::createInstance failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::createInstance failed"); return; } cal->setTime(date, status); - if (FAILURE(status)) { errln("Calendar::setTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::setTime failed"); return; } int32_t offset = cal->getTimeZone().getOffset((uint8_t)cal->get(Calendar::ERA, status), cal->get(Calendar::YEAR, status), cal->get(Calendar::MONTH, status), cal->get(Calendar::DATE, status), (uint8_t)cal->get(Calendar::DAY_OF_WEEK, status), cal->get(Calendar::MILLISECOND, status)); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } logln("offset for " + dateToString(date, str) + "= " + (offset / 1000 / 60 / 60.0) + "hr"); int32_t utc = ((cal->get(Calendar::HOUR_OF_DAY, status) * 60 + cal->get(Calendar::MINUTE, status)) * 60 + cal->get(Calendar::SECOND, status)) * 1000 + cal->get(Calendar::MILLISECOND, status) - offset; - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } int32_t expected = ((hr * 60 + mn) * 60 + sc) * 1000; if (utc != expected) errln(UnicodeString("FAIL: Discrepancy of ") + (utc - expected) + " millis = " + ((utc - expected) / 1000 / 60 / 60.0) + " hr"); @@ -629,19 +629,19 @@ CalendarTest::TestAddSetOrder621() UDate d = date(97, 4, 14, 13, 23, 45); UErrorCode status = U_ZERO_ERROR; Calendar *cal = Calendar::createInstance(status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Calendar::createInstance failed"); delete cal; return; } cal->setTime(d, status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Calendar::setTime failed"); delete cal; return; } cal->add(Calendar::DATE, - 5, status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Calendar::add failed"); delete cal; return; @@ -651,7 +651,7 @@ CalendarTest::TestAddSetOrder621() cal->set(Calendar::SECOND, 0); UnicodeString s; dateToString(cal->getTime(status), s); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); delete cal; return; @@ -659,13 +659,13 @@ CalendarTest::TestAddSetOrder621() delete cal; cal = Calendar::createInstance(status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Calendar::createInstance failed"); delete cal; return; } cal->setTime(d, status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Calendar::setTime failed"); delete cal; return; @@ -674,14 +674,14 @@ CalendarTest::TestAddSetOrder621() cal->set(Calendar::MINUTE, 0); cal->set(Calendar::SECOND, 0); cal->add(Calendar::DATE, - 5, status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Calendar::add failed"); delete cal; return; } UnicodeString s2; dateToString(cal->getTime(status), s2); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); delete cal; return; @@ -704,26 +704,26 @@ CalendarTest::TestAdd520() int32_t y = 1997, m = Calendar::FEBRUARY, d = 1; UErrorCode status = U_ZERO_ERROR; GregorianCalendar *temp = new GregorianCalendar(y, m, d, status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } check520(temp, y, m, d); temp->add(temp->YEAR, 1, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } y++; check520(temp, y, m, d); temp->add(temp->MONTH, 1, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } m++; check520(temp, y, m, d); temp->add(temp->DATE, 1, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } d++; check520(temp, y, m, d); temp->add(temp->DATE, 2, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } d += 2; check520(temp, y, m, d); temp->add(temp->DATE, 28, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } d = 1;++m; check520(temp, y, m, d); delete temp; @@ -741,7 +741,7 @@ CalendarTest::TestAddRollExtensive() int32_t y = 1997, m = Calendar::FEBRUARY, d = 1, hr = 1, min = 1, sec = 0, ms = 0; UErrorCode status = U_ZERO_ERROR; GregorianCalendar *temp = new GregorianCalendar(y, m, d, status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } temp->set(Calendar::HOUR, hr); temp->set(Calendar::MINUTE, min); @@ -758,11 +758,11 @@ CalendarTest::TestAddRollExtensive() status = U_ZERO_ERROR; for (i = 0; i < limit; i++) { temp->add(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++) { temp->add(e, -1, status); - if (FAILURE(status)) { errln("GregorianCalendar::add -1 failed"); return; } + if (U_FAILURE(status)) { errln("GregorianCalendar::add -1 failed"); return; } } check520(temp, y, m, d, hr, min, sec, ms, e); @@ -777,11 +777,11 @@ CalendarTest::TestAddRollExtensive() status = U_ZERO_ERROR; for (i = 0; i < limit; i++) { temp->roll(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++) { temp->roll(e, -1, status); - if (FAILURE(status)) { errln("GregorianCalendar::roll -1 failed"); return; } + if (U_FAILURE(status)) { errln("GregorianCalendar::roll -1 failed"); return; } } check520(temp, y, m, d, hr, min, sec, ms, e); @@ -807,7 +807,7 @@ CalendarTest::check520(Calendar* c, c->get(Calendar::MINUTE, status) != min || c->get(Calendar::SECOND, status) != sec || c->get(Calendar::MILLISECOND, status) != ms) { - errln(UnicodeString("FAILURE for field ") + (int32_t)field + + errln(UnicodeString("U_FAILURE for field ") + (int32_t)field + ": Expected y/m/d h:m:s:ms of " + y + "/" + (m + 1) + "/" + d + " " + hr + ":" + min + ":" + sec + ":" + ms + @@ -820,7 +820,7 @@ CalendarTest::check520(Calendar* c, c->get(Calendar::MILLISECOND, status) ); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } } else logln(UnicodeString("Confirmed: ") + y + "/" + @@ -845,7 +845,7 @@ CalendarTest::check520(Calendar* c, "/" + c->get(Calendar::DATE, status) ); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } } else logln(UnicodeString("Confirmed: ") + y + "/" + @@ -864,13 +864,13 @@ CalendarTest::TestFieldSet4781() // try { UErrorCode status = U_ZERO_ERROR; GregorianCalendar *g = new GregorianCalendar(status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } GregorianCalendar *g2 = new GregorianCalendar(status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } g2->set(Calendar::HOUR, 12, status); g2->set(Calendar::MINUTE, 0, status); g2->set(Calendar::SECOND, 0, status); - if (FAILURE(status)) { errln("Calendar::set failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::set failed"); return; } if (*g == *g2) logln("Same"); else logln("Different"); //} @@ -937,13 +937,13 @@ CalendarTest::TestSecondsZero121() { UErrorCode status = U_ZERO_ERROR; Calendar *cal = new GregorianCalendar(status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } cal->setTime(Calendar::getNow(), status); - if (FAILURE(status)) { errln("Calendar::setTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::setTime failed"); return; } cal->set(Calendar::SECOND, 0); - if (FAILURE(status)) { errln("Calendar::set failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::set failed"); return; } UDate d = cal->getTime(status); - if (FAILURE(status)) { errln("Calendar::getTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); return; } UnicodeString s; dateToString(d, s); if (s.indexOf(":00 ") < 0) errln("Expected to see :00 in " + s); @@ -963,11 +963,11 @@ CalendarTest::TestAddSetGet0610() UErrorCode status = U_ZERO_ERROR; { Calendar *calendar = new GregorianCalendar(status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } calendar->set(1993, Calendar::JANUARY, 4); logln("1A) " + value(calendar)); calendar->add(Calendar::DATE, 1, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } UnicodeString v = value(calendar); logln("1B) " + v); logln("--) 1993/0/5"); @@ -976,10 +976,10 @@ CalendarTest::TestAddSetGet0610() } { Calendar *calendar = new GregorianCalendar(1993, Calendar::JANUARY, 4, status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } logln("2A) " + value(calendar)); calendar->add(Calendar::DATE, 1, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } UnicodeString v = value(calendar); logln("2B) " + v); logln("--) 1993/0/5"); @@ -988,12 +988,12 @@ CalendarTest::TestAddSetGet0610() } { Calendar *calendar = new GregorianCalendar(1993, Calendar::JANUARY, 4, status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } logln("3A) " + value(calendar)); calendar->getTime(status); - if (FAILURE(status)) { errln("Calendar::getTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); return; } calendar->add(Calendar::DATE, 1, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } UnicodeString v = value(calendar); logln("3B) " + v); logln("--) 1993/0/5"); @@ -1011,7 +1011,7 @@ CalendarTest::value(Calendar* calendar) return UnicodeString("") + (int32_t)calendar->get(Calendar::YEAR, status) + "/" + (int32_t)calendar->get(Calendar::MONTH, status) + "/" + (int32_t)calendar->get(Calendar::DATE, status) + - (FAILURE(status) ? " FAIL: Calendar::get failed" : ""); + (U_FAILURE(status) ? " FAIL: Calendar::get failed" : ""); } UnicodeString CalendarTest::EXPECTED_0610 = "1993/0/5"; @@ -1030,14 +1030,14 @@ CalendarTest::TestFields060() int32_t dDate = 22; GregorianCalendar *calendar = 0; calendar = new GregorianCalendar(year, month, dDate, status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } for (int32_t i = 0; i < EXPECTED_FIELDS_length;) { Calendar::EDateFields field = (Calendar::EDateFields)EXPECTED_FIELDS[i++]; int32_t expected = EXPECTED_FIELDS[i++]; if (calendar->get(field, status) != expected) { errln(UnicodeString("Expected field ") + (int32_t)field + " to have value " + (int32_t)expected + "; received " + (int32_t)calendar->get(field, status) + " instead"); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } } } delete calendar; @@ -1067,39 +1067,39 @@ CalendarTest::TestEpochStartFields() UErrorCode status = U_ZERO_ERROR; TimeZone *z = TimeZone::createDefault(); Calendar *c = Calendar::createInstance(status); - if (FAILURE(status)) { errln("Calendar::createInstance failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::createInstance failed"); return; } UDate d = - z->getRawOffset(); GregorianCalendar *gc = new GregorianCalendar(status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } gc->setTimeZone(*z); gc->setTime(d, status); - if (FAILURE(status)) { errln("Calendar::setTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::setTime failed"); return; } bool_t idt = gc->inDaylightTime(status); - if (FAILURE(status)) { errln("GregorianCalendar::inDaylightTime failed"); return; } + if (U_FAILURE(status)) { errln("GregorianCalendar::inDaylightTime failed"); return; } if (idt) { UnicodeString str; logln("Warning: Skipping test because " + dateToString(d, str) + " is in DST."); } else { c->setTime(d, status); - if (FAILURE(status)) { errln("Calendar::setTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::setTime failed"); return; } for (int32_t i = 0; i < Calendar::ZONE_OFFSET;++i) { if (c->get((Calendar::EDateFields)i, status) != EPOCH_FIELDS[i]) errln(UnicodeString("Expected field ") + i + " to have value " + EPOCH_FIELDS[i] + "; saw " + c->get((Calendar::EDateFields)i, status) + " instead"); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } } if (c->get(Calendar::ZONE_OFFSET, status) != z->getRawOffset()) { errln(UnicodeString("Expected field ZONE_OFFSET to have value ") + z->getRawOffset() + "; saw " + c->get(Calendar::ZONE_OFFSET, status) + " instead"); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } } if (c->get(Calendar::DST_OFFSET, status) != 0) { errln(UnicodeString("Expected field DST_OFFSET to have value 0") + "; saw " + c->get(Calendar::DST_OFFSET, status) + " instead"); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } } } delete c; @@ -1122,7 +1122,7 @@ CalendarTest::TestDOWProgression() { UErrorCode status = U_ZERO_ERROR; Calendar *cal = new GregorianCalendar(1972, Calendar::OCTOBER, 26, status); - if (FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } marchByDelta(cal, 24); delete cal; } @@ -1135,22 +1135,22 @@ CalendarTest::marchByDelta(Calendar* cal, int32_t delta) UErrorCode status = U_ZERO_ERROR; Calendar *cur = (Calendar*) cal->clone(); int32_t initialDOW = cur->get(Calendar::DAY_OF_WEEK, status); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } int32_t DOW, newDOW = initialDOW; do { UnicodeString str; DOW = newDOW; logln(UnicodeString("DOW = ") + DOW + " " + dateToString(cur->getTime(status), str)); - if (FAILURE(status)) { errln("Calendar::getTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); return; } cur->add(Calendar::DAY_OF_WEEK, delta, status); - if (FAILURE(status)) { errln("Calendar::add failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::add failed"); return; } newDOW = cur->get(Calendar::DAY_OF_WEEK, status); - if (FAILURE(status)) { errln("Calendar::get failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::get failed"); return; } int32_t expectedDOW = 1 + (DOW + delta - 1) % 7; if (newDOW != expectedDOW) { errln(UnicodeString("Day of week should be ") + expectedDOW + " instead of " + newDOW + " on " + dateToString(cur->getTime(status), str)); - if (FAILURE(status)) { errln("Calendar::getTime failed"); return; } + if (U_FAILURE(status)) { errln("Calendar::getTime failed"); return; } return; } } diff --git a/icu4c/source/test/intltest/caltztst.cpp b/icu4c/source/test/intltest/caltztst.cpp index d9d8e49e77b..1a5e5ea293c 100644 --- a/icu4c/source/test/intltest/caltztst.cpp +++ b/icu4c/source/test/intltest/caltztst.cpp @@ -28,7 +28,7 @@ Calendar* CalendarTimeZoneTest::fgCalendar = 0; bool_t CalendarTimeZoneTest::failure(UErrorCode status, const char* msg) { - if (FAILURE(status)) + if (U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; @@ -55,7 +55,7 @@ DateFormat* CalendarTimeZoneTest::getDateFormat() { UErrorCode status = U_ZERO_ERROR; theFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", status); - if (FAILURE(status)) + if (U_FAILURE(status)) { delete theFormat; theFormat = 0; @@ -101,7 +101,7 @@ Calendar* CalendarTimeZoneTest::getCalendar() { UErrorCode status = U_ZERO_ERROR; theCalendar = Calendar::createInstance(status); - if (FAILURE(status)) + if (U_FAILURE(status)) { delete theCalendar; theCalendar = 0; @@ -163,7 +163,7 @@ CalendarTimeZoneTest::date(int32_t y, int32_t m, int32_t d, int32_t hr, int32_t UErrorCode status = U_ZERO_ERROR; UDate dt = cal->getTime(status); releaseCalendar(cal); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("FAIL: Calendar::getTime failed"); return 0.0; @@ -182,7 +182,7 @@ CalendarTimeZoneTest::utcDate(int32_t y, int32_t m, int32_t d, int32_t hr, int32 cal->get(Calendar::ZONE_OFFSET, status) - cal->get(Calendar::DST_OFFSET, status); releaseCalendar(cal); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("FAIL: Calendar::get failed"); return 0.0; diff --git a/icu4c/source/test/intltest/cppcnvt.cpp b/icu4c/source/test/intltest/cppcnvt.cpp index cfc429ddb0b..81c19e63528 100644 --- a/icu4c/source/test/intltest/cppcnvt.cpp +++ b/icu4c/source/test/intltest/cppcnvt.cpp @@ -20,8 +20,8 @@ void WriteToFile(const UnicodeString *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); /*Asciifies the UErrorCodes*/ #define myErrorName(errorCode) errorName(errorCode) @@ -71,8 +71,8 @@ void ConvertTest::TestConvert() UErrorCode err = U_ZERO_ERROR; const char* const* available_conv = NULL; 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; UnicodeConverterCPP* someConverters[5]; @@ -129,20 +129,20 @@ void ConvertTest::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 Locale CodePagesLocale[NUM_CODEPAGE] = @@ -172,7 +172,7 @@ void ConvertTest::TestConvert() logln("\n---Testing UnicodeConverterCPP::getAvailableNames..."); available_conv = UnicodeConverterCPP::getAvailableNames(testLong1, err); - if (FAILURE(err)) + if (U_FAILURE(err)) { errln("Error getting Available names!"); exit(0); @@ -183,15 +183,15 @@ void ConvertTest::TestConvert() someConverters[0] = new UnicodeConverterCPP("ibm-949",err); - if (FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); + if (U_FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); someConverters[1] = new UnicodeConverterCPP("ibm-949",err); - if (FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); + if (U_FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); someConverters[2] = new UnicodeConverterCPP("ibm-949",err); - if (FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); + if (U_FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); someConverters[3] = new UnicodeConverterCPP("ibm-834", err); - if (FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); + if (U_FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); someConverters[4] = new UnicodeConverterCPP("ibm-943", err); - if (FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); + if (U_FAILURE(err)) errln ((UnicodeString)"FAILURE! " + myErrorName(err)); logln("\n---Testing UnicodeConverterCPP::flushCache..."); if (UnicodeConverterCPP::flushCache()==0) logln("Flush cache ok"); @@ -212,7 +212,7 @@ void ConvertTest::TestConvert() someConverters[0] = new UnicodeConverterCPP; someConverters[1] = new UnicodeConverterCPP; someConverters[2] = new UnicodeConverterCPP("utf8", err); - if (FAILURE(err)) errln ((UnicodeString)"FAILURE! " + err); + if (U_FAILURE(err)) errln ((UnicodeString)"FAILURE! " + err); #ifdef WIN32 if ((strcmp(someConverters[1]->getName(err),"IBM-1252")==0)&& (strcmp(someConverters[0]->getName(err),"IBM-1252")==0)) @@ -265,7 +265,7 @@ void ConvertTest::TestConvert() /*Creates a converter*/ - UnicodeConverterCPP* myConverter = new UnicodeConverterCPP(CodePageNumberToTest[codepage_index],IBM, err); + UnicodeConverterCPP* myConverter = new UnicodeConverterCPP(CodePageNumberToTest[codepage_index],UCNV_IBM, err); if (!myConverter) { @@ -297,9 +297,9 @@ void ConvertTest::TestConvert() logln("\n---Testing UnicodeConverterCPP::setSubstitutionChars RoundTrip Test ..."); myConverter->setSubstitutionChars(myptr, ii, err); - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); myConverter->getSubstitutionChars(save, ii, err); - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); if (strncmp(save, myptr, ii)) errln("Saved substitution character failed"); else logln("Saved substitution character ok"); @@ -342,14 +342,14 @@ void ConvertTest::TestConvert() /*setMissingUnicodeAction*/ logln("\n---Testing UnicodeConverterCPP::setMissingUnicodeAction..."); myConverter->setMissingUnicodeAction(otherUnicodeAction(MIA1),err); - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); if (myConverter->getMissingUnicodeAction() != otherUnicodeAction(MIA1)) logln("Missing action failed"); else logln("Missing action ok"); logln("\n---Testing UnicodeConverterCPP::setMissingUnicodeAction Roundtrip..."); myConverter->setMissingUnicodeAction(MIA1, err); - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); if (myConverter->getMissingUnicodeAction() != MIA1) errln("Missing action failed"); else logln("Missing action ok"); @@ -357,13 +357,13 @@ void ConvertTest::TestConvert() /*setMissingCharAction*/ logln("\n---Testing UnicodeConverterCPP::setMissingCharAction..."); myConverter->setMissingCharAction(otherCharAction(MIA2),err); - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); if (myConverter->getMissingCharAction() != otherCharAction(MIA2)) errln("Missing action failed"); else logln("Missing action ok"); logln("\n---Testing UnicodeConverterCPP::setMissingCharAction Roundtrip..."); myConverter->setMissingCharAction(MIA2, err); - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); if (myConverter->getMissingCharAction() != MIA2) errln("Missing action failed"); else logln("Missing action ok"); @@ -371,7 +371,7 @@ void ConvertTest::TestConvert() /*getCodepage*/ logln("\n---Testing UnicodeConverterCPP::getCodepage..."); cp = myConverter->getCodepage(err); - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); if (cp != CodePageNumberToTest[codepage_index]) errln("Codepage number test failed"); else logln("Codepage number test OK"); @@ -381,7 +381,7 @@ void ConvertTest::TestConvert() logln("\n---Testing UnicodeConverterCPP::getCodepagePlatform ..."); if (CodePagesPlatform[codepage_index]!=myConverter->getCodepagePlatform(err)) errln("Platform codepage test failed"); else logln("Platform codepage test ok"); - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); /*Reads the BOM*/ @@ -415,7 +415,7 @@ void ConvertTest::TestConvert() logln("\n---Testing UnicodeConverterCPP::fromUnicodeString"); myConverter->fromUnicodeString(output_cp_buffer, testLong1, *uniString, err); - if (FAILURE(err)) logln("\nFAILURE..."); + if (U_FAILURE(err)) logln("\nFAILURE..."); @@ -434,7 +434,7 @@ void ConvertTest::TestConvert() logln("\n---Testing UnicodeConverterCPP::toUnicodeString"); myConverter->toUnicodeString(*uniString2 , output_cp_buffer, testLong1, err); - if (FAILURE(err)) logln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) logln ("FAILURE! " + (UnicodeString)myErrorName(err)); @@ -457,7 +457,7 @@ void ConvertTest::TestConvert() err); // consumedUni = (UChar*)tmp_consumedUni; - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); /*Uni1 ----ToUnicode----> Cp2 ----FromUnicode---->Uni3*/ @@ -472,7 +472,7 @@ void ConvertTest::TestConvert() FALSE, err); consumed = (char*)tmp_consumed; - if (FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); + if (U_FAILURE(err)) errln ("FAILURE! " + (UnicodeString)myErrorName(err)); logln("\n---Testing UChar* RoundTrip ..."); @@ -494,12 +494,12 @@ void ConvertTest::TestConvert() char mySJIS[12] = {(char)0xFA, (char)0X51, (char)0XB8, (char)0XDB, (char)0XBD, (char)0XCB, (char)0XDB, (char)0XCC, (char)0XDE, (char)0XD0 , (char)0XFA, (char)0X50}; - UnicodeConverterCPP SJIS(943, IBM, err); + UnicodeConverterCPP SJIS(943, UCNV_IBM, err); UnicodeString myString; SJIS.toUnicodeString(myString, mySJIS, 12, err); - if (FAILURE(err)||(myString.size()!=10)) errln("toUnicodeString test failed"); + if (U_FAILURE(err)||(myString.size()!=10)) errln("toUnicodeString test failed"); else logln("toUnicodeString test ok"); fclose(ucs_file_in); @@ -542,14 +542,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; } diff --git a/icu4c/source/test/intltest/currcoll.cpp b/icu4c/source/test/intltest/currcoll.cpp index d7e7d10e4c6..2ff7f9d1ba4 100644 --- a/icu4c/source/test/intltest/currcoll.cpp +++ b/icu4c/source/test/intltest/currcoll.cpp @@ -71,7 +71,7 @@ void CollationCurrencyTest::currencyTest(char *par) Collator::EComparisonResult expectedResult = Collator::EQUAL; RuleBasedCollator *c = (RuleBasedCollator *)Collator::createInstance(status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln ("Collator::createInstance() failed!"); return; @@ -106,7 +106,7 @@ void CollationCurrencyTest::currencyTest(char *par) c->getCollationKey(source, sourceKey, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("Couldn't get collationKey for source"); continue; @@ -114,7 +114,7 @@ void CollationCurrencyTest::currencyTest(char *par) c->getCollationKey(target, targetKey, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("Couldn't get collationKey for target"); continue; diff --git a/icu4c/source/test/intltest/dacoll.cpp b/icu4c/source/test/intltest/dacoll.cpp index 10caa98b5be..23f217f6bc3 100644 --- a/icu4c/source/test/intltest/dacoll.cpp +++ b/icu4c/source/test/intltest/dacoll.cpp @@ -197,7 +197,7 @@ void CollationDanishTest::doTest( UnicodeString source, UnicodeString target, Co UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) { + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; } diff --git a/icu4c/source/test/intltest/dcfmapts.cpp b/icu4c/source/test/intltest/dcfmapts.cpp index b2bf0f7c774..0f8cdcd85d5 100644 --- a/icu4c/source/test/intltest/dcfmapts.cpp +++ b/icu4c/source/test/intltest/dcfmapts.cpp @@ -30,7 +30,7 @@ void IntlTestDecimalFormatAPI::runIndexedTest( int32_t index, bool_t exec, char* logln((UnicodeString)"DecimalFormat API test---"); logln((UnicodeString)""); UErrorCode status = U_ZERO_ERROR; Locale::setDefault(Locale::ENGLISH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: Could not set default locale, test may not give correct results"); } testAPI(par); @@ -54,32 +54,32 @@ void IntlTestDecimalFormatAPI::testAPI(char *par) logln((UnicodeString)"Testing DecimalFormat constructors"); DecimalFormat def(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: Could not create DecimalFormat (default)"); } status = U_ZERO_ERROR; const UnicodeString pattern("#,##0.# FF"); DecimalFormat pat(pattern, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: Could not create DecimalFormat (pattern)"); } status = U_ZERO_ERROR; DecimalFormatSymbols *symbols = new DecimalFormatSymbols(Locale::FRENCH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: Could not create DecimalFormatSymbols (French)"); } status = U_ZERO_ERROR; DecimalFormat cust1(pattern, symbols, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: Could not create DecimalFormat (pattern, symbols*)"); } status = U_ZERO_ERROR; DecimalFormat cust2(pattern, *symbols, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: Could not create DecimalFormat (pattern, symbols)"); } @@ -124,14 +124,14 @@ void IntlTestDecimalFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; res3 = cust1.format(fD, res3, pos3, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: format(Formattable [double]) failed"); } logln((UnicodeString) "" + (int32_t) fD.getDouble() + " formatted to " + res3); status = U_ZERO_ERROR; res4 = cust2.format(fL, res4, pos4, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: format(Formattable [long]) failed"); } logln((UnicodeString) "" + fL.getLong() + " formatted to " + res4); @@ -146,7 +146,7 @@ void IntlTestDecimalFormatAPI::testAPI(char *par) UnicodeString patt("#,##0.#"); status = U_ZERO_ERROR; pat.applyPattern(patt, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: applyPattern() failed"); } pat.parse(text, result1, pos); @@ -157,7 +157,7 @@ void IntlTestDecimalFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; pat.parse(text, result2, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: parse() failed"); } if(result2.getType() != Formattable::kDouble && result2.getDouble() != d) { @@ -248,7 +248,7 @@ void IntlTestDecimalFormatAPI::testAPI(char *par) logln((UnicodeString)"Applying pattern " + p1); status = U_ZERO_ERROR; pat.applyPattern(p1, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: applyPattern() failed with " + (int32_t) status); } UnicodeString s2; @@ -262,7 +262,7 @@ void IntlTestDecimalFormatAPI::testAPI(char *par) logln((UnicodeString)"Applying pattern " + p2); status = U_ZERO_ERROR; pat.applyLocalizedPattern(p2, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: applyPattern() failed with " + (int32_t) status); } UnicodeString s3; @@ -278,7 +278,7 @@ void IntlTestDecimalFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; NumberFormat *test = new DecimalFormat(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln((UnicodeString)"ERROR: Couldn't create a DecimalFormat"); } diff --git a/icu4c/source/test/intltest/decoll.cpp b/icu4c/source/test/intltest/decoll.cpp index 1451a7f9928..468d42ac2ec 100644 --- a/icu4c/source/test/intltest/decoll.cpp +++ b/icu4c/source/test/intltest/decoll.cpp @@ -100,7 +100,7 @@ void CollationGermanTest::doTest( UnicodeString source, UnicodeString target, Co UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; diff --git a/icu4c/source/test/intltest/dtfmapts.cpp b/icu4c/source/test/intltest/dtfmapts.cpp index 5afb51fc57b..6fa337a0f17 100644 --- a/icu4c/source/test/intltest/dtfmapts.cpp +++ b/icu4c/source/test/intltest/dtfmapts.cpp @@ -31,7 +31,7 @@ void IntlTestDateFormatAPI::runIndexedTest( int32_t index, bool_t exec, char* &n logln("DateFormat API test---"); logln(""); UErrorCode status = U_ZERO_ERROR; Locale::setDefault(Locale::ENGLISH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not set default locale, test may not give correct results"); } testAPI(par); @@ -68,7 +68,7 @@ void IntlTestDateFormatAPI::TestEquals() { double ONE_YEAR = 365*24*60*60*1000.0; ((SimpleDateFormat*)b)->set2DigitYearStart(start + 50*ONE_YEAR, status); - if (FAILURE(status)) + if (U_FAILURE(status)) errln("FAIL: setTwoDigitStartDate failed."); else if (*a == *b) errln("FAIL: DateFormat objects with different two digit start dates are equal."); @@ -114,7 +114,7 @@ void IntlTestDateFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; res1 = fr->format(d, res1, pos1, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: format() failed (French)"); } logln( (UnicodeString) "" + d + " formatted to " + res1); @@ -141,7 +141,7 @@ void IntlTestDateFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; result2 = def->parse(text, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: parse() failed"); } logln(text + " parsed into " + result2); @@ -198,7 +198,7 @@ void IntlTestDateFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; DateFormat *test = new SimpleDateFormat(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Couldn't create a DateFormat"); } diff --git a/icu4c/source/test/intltest/dtfmrgts.cpp b/icu4c/source/test/intltest/dtfmrgts.cpp index 87ccc9cfc34..ae1903b3d19 100644 --- a/icu4c/source/test/intltest/dtfmrgts.cpp +++ b/icu4c/source/test/intltest/dtfmrgts.cpp @@ -384,7 +384,7 @@ void DateFormatRegressionTest::Test4061287() bool_t ok = FALSE; //try { logln(UnicodeString("") + df->parse("35/01/1971", status)); - if(FAILURE(status)) + if(U_FAILURE(status)) ok = TRUE; //logln(df.parse("35/01/1971").toString()); //} catch (ParseException e) {ok=TRUE;} @@ -858,7 +858,7 @@ void DateFormatRegressionTest::Test4106807() format->setTimeZone(*gmt); dt = format->parse(dateString, status); // {sfb} some of these parses will fail purposely - if(FAILURE(status)) + if(U_FAILURE(status)) break; status = U_ZERO_ERROR; UnicodeString fmtd; @@ -990,12 +990,12 @@ DateFormatRegressionTest::Test4162071() UnicodeString format("EEE', 'dd-MMM-yyyy HH:mm:ss z"); // RFC 822/1123 UErrorCode status = U_ZERO_ERROR; SimpleDateFormat df(format, Locale::US, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't create SimpleDateFormat"); //try { UDate x = df.parse(dateString, status); - if(SUCCESS(status)) + if(U_SUCCESS(status)) logln("Parse format \"" + format + "\" ok"); else errln("Parse format \"" + format + "\" failed."); @@ -1014,7 +1014,7 @@ void DateFormatRegressionTest::Test4182066() { UErrorCode status = U_ZERO_ERROR; SimpleDateFormat fmt("MM/dd/yy", Locale::US, status); SimpleDateFormat dispFmt("MMM dd yyyy GG", Locale::US, status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Couldn't create SimpleDateFormat"); return; } @@ -1054,7 +1054,7 @@ void DateFormatRegressionTest::Test4182066() { UDate expected = DATES[i]; status = U_ZERO_ERROR; UDate actual = fmt.parse(str, status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { actual = FAIL_DATE; } UnicodeString actStr; @@ -1099,7 +1099,7 @@ DateFormatRegressionTest::Test4210209() { SimpleDateFormat sdisp("MMM dd yyyy GG", Locale::US, status); DateFormat& fmt = *(DateFormat*)&sfmt; // Yuck: See j25 DateFormat& disp = *(DateFormat*)&sdisp; // Yuck: See j25 - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("Couldn't create SimpleDateFormat"); return; } @@ -1124,7 +1124,7 @@ DateFormatRegressionTest::Test4210209() { // succeed, the bug is fixed. If the bug isn't fixed, they will throw // an exception. GregorianCalendar cal(status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("FAIL: Unable to create Calendar"); return; } @@ -1133,7 +1133,7 @@ DateFormatRegressionTest::Test4210209() { cal.set(2000, Calendar::FEBRUARY, 29); // This should work! logln(UnicodeString("Attempt to set Calendar to Feb 29 2000: ") + disp.format(cal.getTime(status), ss.remove())); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("FAIL: Unable to set Calendar to Feb 29 2000"); } } diff --git a/icu4c/source/test/intltest/dtfmtrtts.cpp b/icu4c/source/test/intltest/dtfmtrtts.cpp index fe1c7f9f707..d97141753c3 100644 --- a/icu4c/source/test/intltest/dtfmtrtts.cpp +++ b/icu4c/source/test/intltest/dtfmtrtts.cpp @@ -50,7 +50,7 @@ DateFormatRoundTripTest::runIndexedTest( int32_t index, bool_t exec, char* &name bool_t DateFormatRoundTripTest::failure(UErrorCode status, const char* msg) { - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; } diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index 829040cc900..8087b126849 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -177,7 +177,7 @@ DateFormatTest::TestTwoDigitYearDSTParse() dateToFields(d, y, m, day, hr, min, sec); if (hr != hour) errln((UnicodeString)"FAIL: Should parse to hour " + hour); - if (FAILURE(status)) + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: " + (int32_t)status); delete s; @@ -288,7 +288,7 @@ DateFormatTest::TestFieldPosition(void) } } for (j=0; japplyPattern(pat); UDate date = format->parse(str, status); - if (FAILURE(status) || date == null) + if (U_FAILURE(status) || date == null) { logln((UnicodeString)"ParseException: " + (int32_t)status); if (expected != null) errln((UnicodeString)"FAIL: Expected " + dateToString(expected)); @@ -387,7 +387,7 @@ DateFormatTest::TestRunTogetherPattern985() logln(then); if (!(date2 == date1)) errln((UnicodeString)"FAIL"); delete formatter; - if (FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } // ------------------------------------- @@ -410,7 +410,7 @@ DateFormatTest::TestRunTogetherPattern917() myDate = "19970304"; testIt917(fmt, myDate, date(97, 3 - 1, 4)); delete fmt; - if (FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } // ------------------------------------- @@ -425,7 +425,7 @@ DateFormatTest::testIt917(SimpleDateFormat* fmt, UnicodeString& str, UDate expec //try { ((Format*)fmt)->parseObject(str, o, status); //} - if (FAILURE(status)) return; + if (U_FAILURE(status)) return; //catch(ParseException e) { // e.printStackTrace(); // return; @@ -435,7 +435,7 @@ DateFormatTest::testIt917(SimpleDateFormat* fmt, UnicodeString& str, UDate expec UnicodeString formatted; ((Format*)fmt)->format(o, formatted, status); logln((UnicodeString)"Formatted string: " + formatted); if (!(formatted == str)) errln((UnicodeString)"FAIL: Expected " + str); - if (FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } // ------------------------------------- @@ -470,7 +470,7 @@ DateFormatTest::TestCzechMonths459() if (month != Calendar::JULY) errln((UnicodeString)"FAIL: Month should be July"); //} //catch(ParseException e) { - if (FAILURE(status)) + if (U_FAILURE(status)) errln((UnicodeString)"Exception: " + (int32_t)status); //} delete fmt; @@ -504,7 +504,7 @@ DateFormatTest::TestLetterDPattern212() logln((UnicodeString)"Using " + littleD + " -> " + dateToString(myDate)); if (myDate != expLittleD) errln((UnicodeString)"FAIL: Expected " + dateToString(expLittleD)); delete formatter; - if (FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } // ------------------------------------- @@ -524,7 +524,7 @@ DateFormatTest::TestDayOfYearPattern195() tryPattern(*sdf, today, 0, expected); tryPattern(*sdf, today, "G yyyy DDD", expected); delete sdf; - if (FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } // ------------------------------------- @@ -547,7 +547,7 @@ DateFormatTest::tryPattern(SimpleDateFormat& sdf, UDate d, const char* pattern, if (!(formatResult == format2)) errln((UnicodeString)"FAIL: Round trip drift"); //} //catch(Exception e) { - if (FAILURE(status)) + if (U_FAILURE(status)) errln((UnicodeString)"Error: " + (int32_t)status); //} } @@ -568,7 +568,7 @@ DateFormatTest::TestQuotePattern161() logln((UnicodeString)"format(" + dateToString(currentTime_1) + ") = " + dateString); if (0 != dateString.compareBetween(0, exp.size(), exp, 0, exp.size())) errln((UnicodeString)"FAIL: Expected " + exp); delete formatter; - if (FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } // ------------------------------------- @@ -600,11 +600,11 @@ DateFormatTest::TestBadInput135() UnicodeString prefix = UnicodeString(text) + ", " + dateLook + "/" + timeLook + ": "; //try { UDate when = df->parse(text, status); - if (when == 0 && SUCCESS(status)) { + if (when == 0 && U_SUCCESS(status)) { errln(prefix + "SHOULD NOT HAPPEN: parse returned null."); continue; } - if (SUCCESS(status)) + if (U_SUCCESS(status)) { UnicodeString format; full->format(when, format); logln(prefix + "OK: " + format); @@ -623,7 +623,7 @@ DateFormatTest::TestBadInput135() } } delete full; - if (FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } const char* DateFormatTest::parseFormats[] = { @@ -674,7 +674,7 @@ DateFormatTest::TestBadInput135a() logln(UnicodeString("Trying to parse \"") + s + "\" with " + dateParse->toPattern(thePat)); //try { date = dateParse->parse(s, status); - if (SUCCESS(status)) + if (U_SUCCESS(status)) errln((UnicodeString)"FAIL: Expected exception during parse"); //} //catch(Exception ex) { @@ -713,13 +713,13 @@ DateFormatTest::TestBadInput135a() } //} //catch(Exception ex) { - if (FAILURE(status)) + if (U_FAILURE(status)) errln((UnicodeString)"An exception was thrown during parse: " + (int32_t)status); //} } } delete dateParse; - if (FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } // ------------------------------------- @@ -750,7 +750,7 @@ DateFormatTest::parse2DigitYear(DateFormat& fmt, const char* str, UDate expected if (d != expected) errln((UnicodeString)"FAIL: Expected " + expected); //} //catch(ParseException e) { - if (FAILURE(status)) + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: Got exception"); //} } @@ -778,7 +778,7 @@ DateFormatTest::TestDateFormatZone061() if (tempDate != date) errln((UnicodeString)"FAIL: Expected " + dateToString(date)); //} //catch(Throwable t) { - if (FAILURE(status)) + if (U_FAILURE(status)) errln((UnicodeString)"Date Formatter throws: " + (int32_t)status); //} delete formatter; diff --git a/icu4c/source/test/intltest/encoll.cpp b/icu4c/source/test/intltest/encoll.cpp index fb9449337ae..5fcba03bf1b 100644 --- a/icu4c/source/test/intltest/encoll.cpp +++ b/icu4c/source/test/intltest/encoll.cpp @@ -264,7 +264,7 @@ void CollationEnglishTest::doTest( UnicodeString source, UnicodeString target, C UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; diff --git a/icu4c/source/test/intltest/escoll.cpp b/icu4c/source/test/intltest/escoll.cpp index f340dca696e..d76ed3fd794 100644 --- a/icu4c/source/test/intltest/escoll.cpp +++ b/icu4c/source/test/intltest/escoll.cpp @@ -87,7 +87,7 @@ void CollationSpanishTest::doTest( UnicodeString source, UnicodeString target, C UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) { + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; } diff --git a/icu4c/source/test/intltest/ficoll.cpp b/icu4c/source/test/intltest/ficoll.cpp index d25e760e427..965c849f7df 100644 --- a/icu4c/source/test/intltest/ficoll.cpp +++ b/icu4c/source/test/intltest/ficoll.cpp @@ -74,7 +74,7 @@ void CollationFinnishTest::doTest( UnicodeString source, UnicodeString target, C UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) { + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; } diff --git a/icu4c/source/test/intltest/frcoll.cpp b/icu4c/source/test/intltest/frcoll.cpp index 8eec42c7472..9f76aed656a 100644 --- a/icu4c/source/test/intltest/frcoll.cpp +++ b/icu4c/source/test/intltest/frcoll.cpp @@ -143,7 +143,7 @@ void CollationFrenchTest::doTest( UnicodeString source, UnicodeString target, Co UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; diff --git a/icu4c/source/test/intltest/g7coll.cpp b/icu4c/source/test/intltest/g7coll.cpp index 49afa423543..02e18912969 100644 --- a/icu4c/source/test/intltest/g7coll.cpp +++ b/icu4c/source/test/intltest/g7coll.cpp @@ -103,7 +103,7 @@ void G7CollationTest::doTest( Collator* myCollation, UnicodeString source, Unico UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) { + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; } @@ -123,7 +123,7 @@ void G7CollationTest::TestG7Locales( char* par ) RuleBasedCollator* tblColl1 = 0; myCollation = Collator::createInstance(locales[i], status); - if (FAILURE(status)) + if (U_FAILURE(status)) { UnicodeString msg; @@ -138,7 +138,7 @@ void G7CollationTest::TestG7Locales( char* par ) const UnicodeString& defRules = ((RuleBasedCollator*)myCollation)->getRules(); status = U_ZERO_ERROR; tblColl1 = new RuleBasedCollator(((RuleBasedCollator*)myCollation)->getRules(), status); - if (FAILURE(status)) + if (U_FAILURE(status)) { UnicodeString msg, name; @@ -181,7 +181,7 @@ void G7CollationTest::TestDemo1( char* par ) newRules.insert(0, baseRules); RuleBasedCollator *myCollation = new RuleBasedCollator(newRules, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln( "Demo Test 1 Table Collation object creation failed."); return; @@ -210,7 +210,7 @@ void G7CollationTest::TestDemo2( char* par ) newRules.insert(0, baseRules); RuleBasedCollator *myCollation = new RuleBasedCollator(newRules, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("Demo Test 2 Table Collation object creation failed."); return; @@ -239,7 +239,7 @@ void G7CollationTest::TestDemo3( char* par ) newRules.insert(0, baseRules); RuleBasedCollator *myCollation = new RuleBasedCollator(newRules, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("Demo Test 3 Table Collation object creation failed."); return; @@ -268,7 +268,7 @@ void G7CollationTest::TestDemo4( char* par ) newRules.insert(0, baseRules); RuleBasedCollator *myCollation = new RuleBasedCollator(newRules, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln( "Demo Test 4 Table Collation object creation failed." ); return; diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp index 924030f58bf..4799c8f8dd2 100644 --- a/icu4c/source/test/intltest/intltest.cpp +++ b/icu4c/source/test/intltest/intltest.cpp @@ -114,7 +114,7 @@ UnicodeString toString(const Formattable& f) { { UErrorCode status = U_ZERO_ERROR; SimpleDateFormat fmt(status); - if (SUCCESS(status)) { + if (U_SUCCESS(status)) { FieldPosition pos; fmt.format(f.getDate(), s, pos); s.insert(0, "[Date:"); diff --git a/icu4c/source/test/intltest/isocoll.cpp b/icu4c/source/test/intltest/isocoll.cpp index dda3c90cba8..9506b532a58 100644 --- a/icu4c/source/test/intltest/isocoll.cpp +++ b/icu4c/source/test/intltest/isocoll.cpp @@ -7052,7 +7052,7 @@ void CollationISOTest::TestAll( char* par ) testArray[i] = new UnicodeString(testCases[i], 1); keyArray[i] = new CollationKey(); myCollation->getCollationKey(*testArray[i], *keyArray[i], status); - if (FAILURE(status)) { + if (U_FAILURE(status)) { err("Creating collation key failed"); return; } diff --git a/icu4c/source/test/intltest/itercoll.cpp b/icu4c/source/test/intltest/itercoll.cpp index fd16746b472..486073c0942 100644 --- a/icu4c/source/test/intltest/itercoll.cpp +++ b/icu4c/source/test/intltest/itercoll.cpp @@ -68,7 +68,7 @@ void CollationIteratorTest::TestPrevious(char *par) c1 = new RuleBasedCollator( "< a,A < b,B < c,C, d,D < z,Z < ch,cH,Ch,CH", status); - if (c1 == NULL || FAILURE(status)) + if (c1 == NULL || U_FAILURE(status)) { errln("Couldn't create a RuleBasedCollator with a contracting sequence."); delete c1; @@ -85,7 +85,7 @@ void CollationIteratorTest::TestPrevious(char *par) RuleBasedCollator *c2 = NULL; c2 = new RuleBasedCollator("< a < b < c/abd < d", status); - if (c2 == NULL || FAILURE(status)) + if (c2 == NULL || U_FAILURE(status)) { errln("Couldn't create a RuleBasedCollator with an expanding sequence."); delete c2; @@ -102,7 +102,7 @@ void CollationIteratorTest::TestPrevious(char *par) RuleBasedCollator *c3 = NULL; c3 = new RuleBasedCollator("< a < b < c/aba < d < z < ch", status); - if (c3 == NULL || FAILURE(status)) + if (c3 == NULL || U_FAILURE(status)) { errln("Couldn't create a RuleBasedCollator with both an expanding and a contracting sequence."); delete c3; @@ -143,7 +143,7 @@ void CollationIteratorTest::TestOffset(char *par) iter->setOffset(0, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("setOffset failed."); } @@ -174,7 +174,7 @@ void CollationIteratorTest::TestSetText(char *par) while ( ++i < 10 && c != CollationElementIterator::NULLORDER) { - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("iter2->next() returned an error."); delete iter2; @@ -187,7 +187,7 @@ void CollationIteratorTest::TestSetText(char *par) // Now set it to point to the same string as the first iterator iter2->setText(test1, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("call to inter2->setText(test1) failed."); } @@ -242,7 +242,7 @@ void CollationIteratorTest::TestClearBuffers(char *par) RuleBasedCollator *c = NULL; c = new RuleBasedCollator("< a < b < c & ab = d", status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Couldn't create a RuleBasedCollator."); delete c; @@ -253,7 +253,7 @@ void CollationIteratorTest::TestClearBuffers(char *par) CollationElementIterator *i = c->createCollationElementIterator(source); int32_t e0 = i->next(status); // save the first collation element - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("call to i->next() failed"); goto bail; @@ -261,7 +261,7 @@ void CollationIteratorTest::TestClearBuffers(char *par) i->setOffset(3, status); // go to the expanding character - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("call to i->setOffset(3) failed"); goto bail; @@ -269,7 +269,7 @@ void CollationIteratorTest::TestClearBuffers(char *par) i->next(status); // but only use up half of it - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("call to i->next() failed"); goto bail; @@ -277,7 +277,7 @@ void CollationIteratorTest::TestClearBuffers(char *par) i->setOffset(0, status); // go back to the beginning - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("call to i->setOffset(0) failed"); goto bail; @@ -289,7 +289,7 @@ void CollationIteratorTest::TestClearBuffers(char *par) // of e... int32_t e = i->next(status); // and get this one again - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("call to i->next() failed."); goto bail; @@ -388,7 +388,7 @@ void CollationIteratorTest::verifyExpansion(UnicodeString rules, ExpansionRecord RuleBasedCollator *coll = NULL; coll = new RuleBasedCollator(rules, status); - if (coll == NULL || FAILURE(status)) + if (coll == NULL || U_FAILURE(status)) { errln("Couldn't create a RuleBasedCollator."); delete coll; @@ -405,7 +405,7 @@ void CollationIteratorTest::verifyExpansion(UnicodeString rules, ExpansionRecord UnicodeString test(&tests[i].character, 1); iter->setText(test, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("call to iter->setText() failed."); return; @@ -413,7 +413,7 @@ void CollationIteratorTest::verifyExpansion(UnicodeString rules, ExpansionRecord int32_t order = iter->next(status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("call to iter->next() failed."); return; diff --git a/icu4c/source/test/intltest/itformat.cpp b/icu4c/source/test/intltest/itformat.cpp index cb30a99ef5b..8f3dae32bc2 100644 --- a/icu4c/source/test/intltest/itformat.cpp +++ b/icu4c/source/test/intltest/itformat.cpp @@ -57,7 +57,7 @@ void IntlTestFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, ch delete tz; UErrorCode status = U_ZERO_ERROR; Locale::setDefault( Locale::ENGLISH, status ); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("itformat: couldn't set default Locale to ENGLISH!"); } } @@ -421,7 +421,7 @@ void IntlTestFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, ch TimeZone::adoptDefault(saveDefaultTimeZone); UErrorCode status = U_ZERO_ERROR; Locale::setDefault( saveDefaultLocale, status ); - if (FAILURE(status)) { + if (U_FAILURE(status)) { errln("itformat: couldn't re-set default Locale!"); } } diff --git a/icu4c/source/test/intltest/jacoll.cpp b/icu4c/source/test/intltest/jacoll.cpp index 1edc018a42c..814633d9725 100644 --- a/icu4c/source/test/intltest/jacoll.cpp +++ b/icu4c/source/test/intltest/jacoll.cpp @@ -92,7 +92,7 @@ void CollationKanaTest::doTest( UnicodeString source, UnicodeString target, Coll UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) { + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; } diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 1ebd10c10f0..b0c9a1c921f 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -196,7 +196,7 @@ LocaleTest::TestDisplayNames() UErrorCode err = U_ZERO_ERROR; Locale::setDefault(english, err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { errln("Locale::setDefault returned error code " + (int)err); return; } @@ -214,7 +214,7 @@ LocaleTest::TestDisplayNames() doTestDisplayNames(greek, DLANG_EL, FALSE); Locale::setDefault(french, err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { errln("Locale::setDefault returned error code " + (int)err); return; } @@ -232,7 +232,7 @@ LocaleTest::TestDisplayNames() doTestDisplayNames(greek, DLANG_EL, TRUE); Locale::setDefault(saveDefault, err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { errln("Locale::setDefault returned error code " + (int)err); return; } @@ -645,7 +645,7 @@ LocaleTest::TestISO3Fallback() result = test.getISO3Language(result, err); //} //catch (MissingResourceException e) { - if(FAILURE(err)) + if(U_FAILURE(err)) gotException = TRUE; //} if (!gotException) @@ -657,7 +657,7 @@ LocaleTest::TestISO3Fallback() result = test.getISO3Country(result, err); //} //catch (MissingResourceException e) { - if(FAILURE(err)) + if(U_FAILURE(err)) gotException = TRUE; //} if (!gotException) @@ -1217,7 +1217,7 @@ LocaleTest::date(int32_t y, int32_t m, int32_t d, int32_t hr, int32_t min, int32 cal->clear(); cal->set(1900 + y, m, d, hr, min, sec); // Add 1900 to follow java.util.Date protocol UDate dt = cal->getTime(status); - if (FAILURE(status)) + if (U_FAILURE(status)) return 0.0; delete cal; @@ -1257,7 +1257,7 @@ LocaleTest::Test4147315() locale.getISO3Country(result, err); UnicodeString temp; - if(SUCCESS(err)) + if(U_SUCCESS(err)) errln("ERROR: getISO3Country() returns: " + result + " for locale '" + locale.getName(temp) + "' rather than exception" ); //} catch(MissingResourceException e) { } @@ -1281,7 +1281,7 @@ LocaleTest::Test4147317() locale.getISO3Language(result, err); UnicodeString temp; - if(SUCCESS(err)) + if(U_SUCCESS(err)) errln("ERROR: getISO3Language() returns: " + result + " for locale '" + locale.getName(temp) + "' rather than exception" ); //} catch(MissingResourceException e) { } @@ -1406,7 +1406,7 @@ LocaleTest::Test4105828() UErrorCode status = U_ZERO_ERROR; for (int32_t i = 0; i < 4; ++i) { NumberFormat *fmt = NumberFormat::createPercentInstance(LOC[i], status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create NumberFormat"); return; } diff --git a/icu4c/source/test/intltest/miscdtfm.cpp b/icu4c/source/test/intltest/miscdtfm.cpp index 41c5eab03c7..4e942e3f8db 100644 --- a/icu4c/source/test/intltest/miscdtfm.cpp +++ b/icu4c/source/test/intltest/miscdtfm.cpp @@ -44,7 +44,7 @@ DateFormatMiscTests::runIndexedTest( int32_t index, bool_t exec, char* &name, ch bool_t DateFormatMiscTests::failure(UErrorCode status, const char* msg) { - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; } @@ -53,7 +53,7 @@ DateFormatMiscTests::failure(UErrorCode status, const char* msg) } /* - * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.3 $ $Date: 1999/10/07 00:07:52 $ + * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.4 $ $Date: 1999/10/18 22:48:31 $ * * @bug 4097450 */ @@ -145,7 +145,7 @@ DateFormatMiscTests::test4097450() } /* - * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.3 $ $Date: 1999/10/07 00:07:52 $ + * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.4 $ $Date: 1999/10/18 22:48:31 $ * * @bug 4099975 */ diff --git a/icu4c/source/test/intltest/msfmrgts.cpp b/icu4c/source/test/intltest/msfmrgts.cpp index ca9b45dead4..aa90158697b 100644 --- a/icu4c/source/test/intltest/msfmrgts.cpp +++ b/icu4c/source/test/intltest/msfmrgts.cpp @@ -59,7 +59,7 @@ MessageFormatRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* & bool_t MessageFormatRegressionTest::failure(UErrorCode status, const char* msg) { - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; } @@ -437,7 +437,7 @@ void MessageFormatRegressionTest::Test4114743() //try { UnicodeString illegalPattern("ab { '}' de"); mf->applyPattern(illegalPattern, status); - if( ! FAILURE(status)) + if( ! U_FAILURE(status)) errln("illegal pattern: \"" + illegalPattern + "\""); /*} catch (IllegalArgumentException foo) { if (!originalPattern.equals(mf.toPattern())) @@ -546,7 +546,7 @@ void MessageFormatRegressionTest::Test4113018() logln("illegal pattern: \"" + illegalPattern + "\""); //try { mf->applyPattern(illegalPattern, status); - if( ! FAILURE(status)) + if( ! U_FAILURE(status)) errln("Should have thrown IllegalArgumentException for pattern : " + illegalPattern); /*} catch (IllegalArgumentException e) { if (!originalPattern.equals(mf.toPattern())) diff --git a/icu4c/source/test/intltest/nmfmapts.cpp b/icu4c/source/test/intltest/nmfmapts.cpp index 9b01dd0866c..957e0366f06 100644 --- a/icu4c/source/test/intltest/nmfmapts.cpp +++ b/icu4c/source/test/intltest/nmfmapts.cpp @@ -31,7 +31,7 @@ void IntlTestNumberFormatAPI::runIndexedTest( int32_t index, bool_t exec, char* logln("NumberFormat API test---"); logln(""); UErrorCode status = U_ZERO_ERROR; Locale::setDefault(Locale::ENGLISH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not set default locale, test may not give correct results"); } testAPI(par); @@ -55,35 +55,35 @@ void IntlTestNumberFormatAPI::testAPI(char *par) logln("Testing NumberFormat constructors"); NumberFormat *def = NumberFormat::createInstance(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create NumberFormat (default)"); } status = U_ZERO_ERROR; NumberFormat *fr = NumberFormat::createInstance(Locale::FRENCH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create NumberFormat (French)"); } NumberFormat *cur = NumberFormat::createCurrencyInstance(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create NumberFormat (currency, default)"); } status = U_ZERO_ERROR; NumberFormat *cur_fr = NumberFormat::createCurrencyInstance(Locale::FRENCH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create NumberFormat (currency, French)"); } NumberFormat *per = NumberFormat::createPercentInstance(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create NumberFormat (percent, default)"); } status = U_ZERO_ERROR; NumberFormat *per_fr = NumberFormat::createPercentInstance(Locale::FRENCH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create NumberFormat (percent, French)"); } @@ -121,14 +121,14 @@ void IntlTestNumberFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; res5 = cur_fr->format(fD, res5, pos3, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: format(Formattable [double]) failed"); } logln((UnicodeString) "" + (int32_t) fD.getDouble() + " formatted to " + res5); status = U_ZERO_ERROR; res6 = cur_fr->format(fL, res6, pos4, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: format(Formattable [long]) failed"); } logln((UnicodeString) "" + fL.getLong() + " formatted to " + res6); @@ -155,7 +155,7 @@ void IntlTestNumberFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; fr->parse(text, result3, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: parse() failed"); } if(result3.getType() != Formattable::kDouble && result3.getDouble() != d) { @@ -214,7 +214,7 @@ void IntlTestNumberFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; NumberFormat *test = new DecimalFormat(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Couldn't create a NumberFormat"); } diff --git a/icu4c/source/test/intltest/nmfmtrt.cpp b/icu4c/source/test/intltest/nmfmtrt.cpp index 2d75e7d4838..e63e6ae7b1c 100644 --- a/icu4c/source/test/intltest/nmfmtrt.cpp +++ b/icu4c/source/test/intltest/nmfmtrt.cpp @@ -44,7 +44,7 @@ void NumberFormatRoundTripTest::runIndexedTest( int32_t index, bool_t exec, char bool_t NumberFormatRoundTripTest::failure(UErrorCode status, const char* msg) { - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; } diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp index 38fb7898dba..551b217fcc2 100644 --- a/icu4c/source/test/intltest/numfmtst.cpp +++ b/icu4c/source/test/intltest/numfmtst.cpp @@ -25,7 +25,7 @@ #define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break; -#define CHECK(status,str) if (FAILURE(status)) { errln(UnicodeString("FAIL: ") + str); return; } +#define CHECK(status,str) if (U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + str); return; } void NumberFormatTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par ) { @@ -57,7 +57,7 @@ NumberFormatTest::TestPatterns() { UErrorCode status = U_ZERO_ERROR; DecimalFormatSymbols sym(Locale::US, status); - if (FAILURE(status)) { errln("FAIL: Could not construct DecimalFormatSymbols"); return; } + if (U_FAILURE(status)) { errln("FAIL: Could not construct DecimalFormatSymbols"); return; } const char* pat[] = { "#.#", "#.", ".#", "#" }; int32_t pat_length = sizeof(pat) / sizeof(pat[0]); @@ -67,7 +67,7 @@ NumberFormatTest::TestPatterns() { status = U_ZERO_ERROR; DecimalFormat fmt(pat[i], sym, status); - if (FAILURE(status)) { errln((UnicodeString)"FAIL: DecimalFormat constructor failed for " + pat[i]); continue; } + if (U_FAILURE(status)) { errln((UnicodeString)"FAIL: DecimalFormat constructor failed for " + pat[i]); continue; } UnicodeString newp; fmt.toPattern(newp); if (!(newp == newpat[i])) errln((UnicodeString)"FAIL: Pattern " + pat[i] + " should transmute to " + newpat[i] + @@ -91,7 +91,7 @@ NumberFormatTest::TestExponential() { UErrorCode status = U_ZERO_ERROR; DecimalFormatSymbols sym(Locale::US, status); - if (FAILURE(status)) { errln("FAIL: Bad status returned by DecimalFormatSymbols ct"); return; } + if (U_FAILURE(status)) { errln("FAIL: Bad status returned by DecimalFormatSymbols ct"); return; } char* pat[] = { "0.####E0", "00.000E00", "##0.######E000", "0.###E0;[0.###E0]" }; int32_t pat_length = sizeof(pat) / sizeof(pat[0]); double val[] = { 0.01234, 123456789, 1.23e300, -3.141592653e-271 }; @@ -138,7 +138,7 @@ NumberFormatTest::TestExponential() for (int32_t p=0; p \"" + fmt.toPattern(pattern) + "\""); @@ -258,7 +258,7 @@ NumberFormatTest::TestCurrencySign() if (s != "USD -1,234.56") errln((UnicodeString)"FAIL: Expected USD -1,234.56"); delete fmt; delete sym; - if (FAILURE(status)) errln((UnicodeString)"FAIL: Status " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: Status " + (int32_t)status); } // ------------------------------------- @@ -311,7 +311,7 @@ NumberFormatTest::TestCurrency() logln((UnicodeString)"Un pauvre en France a....." + s); if (!(s=="1,50 F")) errln((UnicodeString)"FAIL: Expected 1,50 F"); delete currencyFmt; - if (FAILURE(status)) errln((UnicodeString)"FAIL: Status " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: Status " + (int32_t)status); } // ------------------------------------- @@ -331,7 +331,7 @@ NumberFormatTest::TestParse() if (n.getType() != Formattable::kLong || n.getLong() != 0) errln((UnicodeString)"FAIL: Expected 0"); delete format; - if (FAILURE(status)) errln((UnicodeString)"FAIL: Status " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: Status " + (int32_t)status); //} //catch(Exception e) { // errln((UnicodeString)"Exception caught: " + e); @@ -356,7 +356,7 @@ NumberFormatTest::TestRounding487() roundingTest(*nf, 12.4999, 0, "12"); roundingTest(*nf, - 19.5, 0, "-20"); delete nf; - if (FAILURE(status)) errln((UnicodeString)"FAIL: Status " + (int32_t)status); + if (U_FAILURE(status)) errln((UnicodeString)"FAIL: Status " + (int32_t)status); } // ------------------------------------- @@ -705,7 +705,7 @@ void NumberFormatTest::expectPad(DecimalFormat& fmt, const UnicodeString& pat, UChar apad = 0; UErrorCode status = U_ZERO_ERROR; fmt.applyPattern(pat, status); - if (SUCCESS(status)) { + if (U_SUCCESS(status)) { apos = fmt.getPadPosition(); awidth = fmt.getFormatWidth(); apad = fmt.getPadCharacter(); diff --git a/icu4c/source/test/intltest/numrgts.cpp b/icu4c/source/test/intltest/numrgts.cpp index 4cef8d633bb..37bc4396b70 100644 --- a/icu4c/source/test/intltest/numrgts.cpp +++ b/icu4c/source/test/intltest/numrgts.cpp @@ -100,7 +100,7 @@ NumberFormatRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &n bool_t NumberFormatRegressionTest::failure(UErrorCode status, const UnicodeString& msg) { - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; } @@ -527,7 +527,7 @@ void NumberFormatRegressionTest::Test4087251 () failure(status, "new DecimalFormat"); //try { df->applyPattern(UnicodeString("#.#.#"), status); - if( ! FAILURE(status)) + if( ! U_FAILURE(status)) errln("df->applyPattern with illegal pattern didn't fail"); UnicodeString temp; logln("toPattern() returns \"" + df->toPattern(temp) + "\""); @@ -538,7 +538,7 @@ void NumberFormatRegressionTest::Test4087251 () // Second test; added 5/11/98 when reported to fail on 1.2b3 //try { df->applyPattern("#0.0#0#0", status); - if( ! FAILURE(status)) + if( ! U_FAILURE(status)) errln("df->applyPattern with illegal pattern didn't fail"); logln("toPattern() returns \"" + df->toPattern(temp) + "\""); //errln("applyPattern(\"#0.0#0#0\") doesn't throw IllegalArgumentException"); @@ -1094,7 +1094,7 @@ void NumberFormatRegressionTest::Test4099404() //try { UErrorCode status = U_ZERO_ERROR; DecimalFormat *fmt = new DecimalFormat(UnicodeString("000.0#0"), status); - if(! FAILURE(status)) + if(! U_FAILURE(status)) errln(UnicodeString("Bug 4099404 failed applying illegal pattern \"000.0#0\"")); /*} catch (Exception foo) { logln("Bug 4099404 pattern \"000.0#0\" passed"); @@ -1103,7 +1103,7 @@ void NumberFormatRegressionTest::Test4099404() fmt = 0; //try { fmt = new DecimalFormat(UnicodeString("0#0.000"), status); - if( !FAILURE(status)) + if( !U_FAILURE(status)) errln("Bug 4099404 failed applying illegal pattern \"0#0.000\""); /*} catch (Exception foo) { logln("Bug 4099404 pattern \"0#0.000\" passed"); @@ -1133,7 +1133,7 @@ void NumberFormatRegressionTest::Test4052223() failure(status, "new DecimalFormat"); Formattable num; fmt->parse(UnicodeString("abc3"), num, status); - if(! FAILURE(status)) + if(! U_FAILURE(status)) errln(UnicodeString("Bug 4052223 failed : can't parse string \"a\". Got ") /*+ num*/); /*} catch (ParseException foo) { logln("Caught expected ParseException : " + foo.getMessage() + " at index : " + foo.getErrorOffset()); @@ -1792,7 +1792,7 @@ NumberFormatRegressionTest::Test4162198() double dbl = LONG_MAX * 1000.0; UErrorCode status = U_ZERO_ERROR; NumberFormat *f = NumberFormat::createInstance(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create number format"); return; } @@ -1804,7 +1804,7 @@ NumberFormatRegressionTest::Test4162198() Formattable n; //try { f->parse(s, n, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't parse!"); //} catch (java.text.ParseException e) { // errln("Caught a ParseException:"); @@ -1830,7 +1830,7 @@ NumberFormatRegressionTest::Test4162852() for(int32_t i=0; i < 2; ++i) { NumberFormat *f = (i == 0) ? NumberFormat::createInstance(status) : NumberFormat::createPercentInstance(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("Couldn't create number format"); return; } @@ -1840,7 +1840,7 @@ NumberFormatRegressionTest::Test4162852() f->format(d, s); Formattable n; f->parse(s, n, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't parse!"); double e = n.getDouble(); logln(UnicodeString("") + @@ -2106,7 +2106,7 @@ void NumberFormatRegressionTest::Test4212072() { failure(status, "createPercentInstance"); break; } - if (FAILURE(status)) { + if (U_FAILURE(status)) { continue; } DecimalFormat *df = (DecimalFormat*) nf; @@ -2133,7 +2133,7 @@ void NumberFormatRegressionTest::Test4212072() { f2.applyLocalizedPattern(pat, status); failure(status, UnicodeString("applyLocalizedPattern(") + pat + ")"); - if (FAILURE(status)) { + if (U_FAILURE(status)) { continue; } if (*df != f2) { diff --git a/icu4c/source/test/intltest/pptest.cpp b/icu4c/source/test/intltest/pptest.cpp index aa51175d176..7a2d89412be 100644 --- a/icu4c/source/test/intltest/pptest.cpp +++ b/icu4c/source/test/intltest/pptest.cpp @@ -36,7 +36,7 @@ void ParsePositionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, bool_t ParsePositionTest::failure(UErrorCode status, const char* msg) { - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; } diff --git a/icu4c/source/test/intltest/regcoll.cpp b/icu4c/source/test/intltest/regcoll.cpp index a6b1e97d5bd..57962c3087b 100644 --- a/icu4c/source/test/intltest/regcoll.cpp +++ b/icu4c/source/test/intltest/regcoll.cpp @@ -70,7 +70,7 @@ void CollationRegressionTest::Test4048446(char *par) while (i1->next(status) != CollationElementIterator::NULLORDER) { - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("error calling next()"); @@ -253,7 +253,7 @@ void CollationRegressionTest::Test4058613(char *par) Locale::setDefault(Locale::KOREAN, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("Could not set default locale to Locale::KOREAN"); return; @@ -263,7 +263,7 @@ void CollationRegressionTest::Test4058613(char *par) c = Collator::createInstance(status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Could not create a Korean collator"); Locale::setDefault(oldDefault, status); @@ -297,7 +297,7 @@ void CollationRegressionTest::Test4059820(char *par) c = new RuleBasedCollator(rules, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Failure building a collator."); delete c; @@ -332,7 +332,7 @@ void CollationRegressionTest::Test4060154(char *par) c = new RuleBasedCollator(rules, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("failure building collator."); delete c; @@ -395,7 +395,7 @@ void CollationRegressionTest::Test4062418(char *par) c = (RuleBasedCollator *) Collator::createInstance(Locale::FRANCE, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Failed to create collator for Locale::FRANCE"); delete c; @@ -474,7 +474,7 @@ void CollationRegressionTest::Test4066696(char *par) c = (RuleBasedCollator *)Collator::createInstance(Locale::FRANCE, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Failure creating collator for Locale::FRANCE"); delete c; @@ -558,7 +558,7 @@ void CollationRegressionTest::Test4078588(char *par) UErrorCode status = U_ZERO_ERROR; RuleBasedCollator *rbc = new RuleBasedCollator("< a < bb", status); - if (rbc == NULL || FAILURE(status)) + if (rbc == NULL || U_FAILURE(status)) { errln("Failed to create RuleBasedCollator."); delete rbc; @@ -619,7 +619,7 @@ void CollationRegressionTest::Test4087241(char *par) c = (RuleBasedCollator *) Collator::createInstance(da_DK, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Failed to create collator for da_DK locale"); delete c; @@ -672,7 +672,7 @@ void CollationRegressionTest::Test4092260(char *par) c = Collator::createInstance(el, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Failed to create collator for el locale."); delete c; @@ -697,7 +697,7 @@ void CollationRegressionTest::Test4095316(char *par) Locale el_GR("el", "GR"); Collator *c = Collator::createInstance(el_GR, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Failed to create collator for el_GR locale"); delete c; @@ -727,7 +727,7 @@ void CollationRegressionTest::Test4101940(char *par) c = new RuleBasedCollator(rules, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Failed to create RuleBasedCollator"); delete c; @@ -815,7 +815,7 @@ void CollationRegressionTest::Test4124632(char *par) coll = Collator::createInstance(Locale::JAPAN, status); - if (coll == NULL || FAILURE(status)) + if (coll == NULL || U_FAILURE(status)) { errln("Failed to create collator for Locale::JAPAN"); delete coll; @@ -826,7 +826,7 @@ void CollationRegressionTest::Test4124632(char *par) coll->getCollationKey(test, key, status); - if (key.isBogus() || FAILURE(status)) + if (key.isBogus() || U_FAILURE(status)) { errln("CollationKey creation failed."); } @@ -846,7 +846,7 @@ void CollationRegressionTest::Test4132736(char *par) c = Collator::createInstance(Locale::FRANCE, status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { errln("Failed to create a collator for Locale::FRANCE"); delete c; @@ -936,7 +936,7 @@ void CollationRegressionTest::Test4141640(char *par) c = Collator::createInstance(locales[i], status); - if (c == NULL || FAILURE(status)) + if (c == NULL || U_FAILURE(status)) { UnicodeString msg, localeName; @@ -968,7 +968,7 @@ void CollationRegressionTest::Test4139572(char *par) col = Collator::createInstance(l, status); - if (col == NULL || FAILURE(status)) + if (col == NULL || U_FAILURE(status)) { errln("Failed to create a collator for es_es locale."); delete col; @@ -980,7 +980,7 @@ void CollationRegressionTest::Test4139572(char *par) // this spanish phrase kills it! col->getCollationKey("Nombre De Objeto", key, status); - if (key.isBogus() || FAILURE(status)) + if (key.isBogus() || U_FAILURE(status)) { errln("Error creating CollationKey for \"Nombre De Ojbeto\""); } @@ -1042,7 +1042,7 @@ void CollationRegressionTest::Test4146160(char *par) mc = new My4146160Collator(*en_us, status); - if (mc == NULL || FAILURE(status)) + if (mc == NULL || U_FAILURE(status)) { errln("Failed to create a My4146160Collator."); delete mc; @@ -1051,7 +1051,7 @@ void CollationRegressionTest::Test4146160(char *par) mc->getCollationKey("1", key, status); - if (key.isBogus() || FAILURE(status)) + if (key.isBogus() || U_FAILURE(status)) { errln("Failure to get a CollationKey from a My4146160Collator."); delete mc; @@ -1113,7 +1113,7 @@ void CollationRegressionTest::compareArray(Collator &c, c.getCollationKey(source, sourceKey, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("Couldn't get collationKey for source"); continue; @@ -1121,7 +1121,7 @@ void CollationRegressionTest::compareArray(Collator &c, c.getCollationKey(target, targetKey, status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("Couldn't get collationKey for target"); continue; diff --git a/icu4c/source/test/intltest/restest.cpp b/icu4c/source/test/intltest/restest.cpp index f2f5b55e960..5755b037cda 100644 --- a/icu4c/source/test/intltest/restest.cpp +++ b/icu4c/source/test/intltest/restest.cpp @@ -262,7 +262,7 @@ ResourceBundleTest::TestConstruction() test1.getString("string_in_Default_te_te_IN", result1, err); test2.getString("string_in_Default_te_te_IN", result2, err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { errln("Something threw an error in TestConstruction()"); return; } @@ -311,7 +311,7 @@ ResourceBundleTest::TestConstruction() test2.getString("string_in_Default_te_te_IN", result2, err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { errln("Something threw an error in TestConstruction()"); return; } @@ -415,7 +415,7 @@ ResourceBundleTest::testTag(const char* frag, CONFIRM_UErrorCode(status, expected_resource_status); UnicodeString expected_string; - expected_string = SUCCESS(status) ? base : kERROR; + expected_string = U_SUCCESS(status) ? base : kERROR; CONFIRM_EQ(string, expected_string); @@ -435,7 +435,7 @@ ResourceBundleTest::testTag(const char* frag, const UnicodeString* array = theBundle.getStringArray(tag, count, status); CONFIRM_UErrorCode(status,expected_resource_status); - if (SUCCESS(status)) + if (U_SUCCESS(status)) { CONFIRM_GE(count,1); CONFIRM_NE((int32_t)array,(int32_t)0); @@ -472,7 +472,7 @@ ResourceBundleTest::testTag(const char* frag, expected_status = (index >= 0 && index < count) ? expected_resource_status : U_MISSING_RESOURCE_ERROR; CONFIRM_UErrorCode(status,expected_status); - if (SUCCESS(status)) + if (U_SUCCESS(status)) { char buf[32]; expected_string = base; @@ -501,7 +501,7 @@ ResourceBundleTest::testTag(const char* frag, const UnicodeString** array2d = theBundle.get2dArray(tag, row_count, column_count, status); CONFIRM_UErrorCode(status,expected_resource_status); - if (SUCCESS(status)) + if (U_SUCCESS(status)) { CONFIRM_GE(row_count,1); CONFIRM_GE(column_count,(int32_t)0); @@ -546,7 +546,7 @@ ResourceBundleTest::testTag(const char* frag, expected_resource_status: U_MISSING_RESOURCE_ERROR; CONFIRM_UErrorCode(status,expected_status); - if (SUCCESS(status)) + if (U_SUCCESS(status)) { char buf[32]; expected_string = base; @@ -580,7 +580,7 @@ ResourceBundleTest::testTag(const char* frag, theBundle.getTaggedArray(tag, tags, items, expected_count, status); CONFIRM_UErrorCode(status, expected_resource_status); - if (SUCCESS(status)) { + if (U_SUCCESS(status)) { CONFIRM_GE((int32_t)expected_count, (int32_t)0); CONFIRM_NE((int32_t)tags, (int32_t)0); CONFIRM_NE((int32_t)items, (int32_t)0); diff --git a/icu4c/source/test/intltest/sdtfmtts.cpp b/icu4c/source/test/intltest/sdtfmtts.cpp index fee2ca95d0a..6b5ffd9e840 100644 --- a/icu4c/source/test/intltest/sdtfmtts.cpp +++ b/icu4c/source/test/intltest/sdtfmtts.cpp @@ -30,7 +30,7 @@ void IntlTestSimpleDateFormatAPI::runIndexedTest( int32_t index, bool_t exec, ch logln("SimpleDateFormat API test---"); logln(""); UErrorCode status = U_ZERO_ERROR; Locale::setDefault(Locale::ENGLISH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not set default locale, test may not give correct results"); } testAPI(par); @@ -53,38 +53,38 @@ void IntlTestSimpleDateFormatAPI::testAPI(char *par) logln("Testing SimpleDateFormat constructors"); SimpleDateFormat def(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create SimpleDateFormat (default)"); } status = U_ZERO_ERROR; const UnicodeString pattern("yyyy.MM.dd G 'at' hh:mm:ss z"); SimpleDateFormat pat(pattern, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create SimpleDateFormat (pattern)"); } status = U_ZERO_ERROR; SimpleDateFormat pat_fr(pattern, Locale::FRENCH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create SimpleDateFormat (pattern French)"); } status = U_ZERO_ERROR; DateFormatSymbols *symbols = new DateFormatSymbols(Locale::FRENCH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create DateFormatSymbols (French)"); } status = U_ZERO_ERROR; SimpleDateFormat cust1(pattern, symbols, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create SimpleDateFormat (pattern, symbols*)"); } status = U_ZERO_ERROR; SimpleDateFormat cust2(pattern, *symbols, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Could not create SimpleDateFormat (pattern, symbols)"); } @@ -124,7 +124,7 @@ void IntlTestSimpleDateFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; res2 = cust1.format(fD, res2, pos2, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: format(Formattable [Date]) failed"); } logln((UnicodeString) "" + fD.getDate() + " formatted to " + res2); @@ -141,7 +141,7 @@ void IntlTestSimpleDateFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; result2 = def.parse(text, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: parse() failed"); } logln(text + " parsed into " + result2); @@ -160,13 +160,13 @@ void IntlTestSimpleDateFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; UDate startDate = pat.get2DigitYearStart(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: getTwoDigitStartDate() failed"); } status = U_ZERO_ERROR; pat_fr.set2DigitYearStart(startDate, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: setTwoDigitStartDate() failed"); } @@ -189,13 +189,13 @@ void IntlTestSimpleDateFormatAPI::testAPI(char *par) logln("Applying pattern " + p1); status = U_ZERO_ERROR; pat.applyLocalizedPattern(p1, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: applyPattern() failed with " + (int32_t) status); } UnicodeString s3; status = U_ZERO_ERROR; s3 = pat.toLocalizedPattern(s3, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: toLocalizedPattern() failed"); } logln("Extracted pattern is " + s3); @@ -209,7 +209,7 @@ void IntlTestSimpleDateFormatAPI::testAPI(char *par) status = U_ZERO_ERROR; DateFormat *test = new SimpleDateFormat(status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Couldn't create a SimpleDateFormat"); } diff --git a/icu4c/source/test/intltest/tchcfmt.cpp b/icu4c/source/test/intltest/tchcfmt.cpp index 2ae7005f9fc..842d4be7856 100644 --- a/icu4c/source/test/intltest/tchcfmt.cpp +++ b/icu4c/source/test/intltest/tchcfmt.cpp @@ -26,7 +26,7 @@ static bool_t chkstatus( UErrorCode &status, char* msg = NULL ) { - bool_t ok = SUCCESS(status); + bool_t ok = U_SUCCESS(status); if (!ok) it_errln( msg ); return ok; } @@ -390,7 +390,7 @@ TestChoiceFormat::TestComplexExample( void ) } /* - ClassID classID = ChoiceFormat::getStaticClassID(); + UClassID classID = ChoiceFormat::getStaticClassID(); if (classID == form_pat.getDynamicClassID()) { it_out << "getStaticClassID and getDynamicClassID tested." << endl; }else{ diff --git a/icu4c/source/test/intltest/tmsgfmt.cpp b/icu4c/source/test/intltest/tmsgfmt.cpp index 722b7b92da1..f0e5bc9a6c3 100644 --- a/icu4c/source/test/intltest/tmsgfmt.cpp +++ b/icu4c/source/test/intltest/tmsgfmt.cpp @@ -134,7 +134,7 @@ void TestMessageFormat::testBug3() UErrorCode success = U_ZERO_ERROR; // form = (DecimalFormat*)NumberFormat::createCurrencyInstance(locale[i], success); form = (DecimalFormat*)NumberFormat::createInstance(locale[i], success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { it_errln("Err: Number Format "); it_out << "Number format creation failed.\n"; continue; @@ -149,7 +149,7 @@ void TestMessageFormat::testBug3() #ifdef _DEBUG it_out << " -> " /*<< dec*/ /*<< result*/ << "[supposed output for result]" <format(testArgs, count, result, fieldpos, success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { it_errln ("MessageFormat failed test #3"); it_out << "TestMessageFormat::PatternTest failed test #3" << endl; continue; @@ -299,7 +299,7 @@ void TestMessageFormat::PatternTest() it_out << "MSG pattern for parse: " << buffer << endl; Formattable* values = form->parse(result, count, success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { errln("MessageFormat failed test #5"); logln(UnicodeString("MessageFormat failed test #5 with error code ")+(int32_t)success); }else @@ -326,7 +326,7 @@ void TestMessageFormat::sample() UnicodeString buffer1, buffer2; UErrorCode success = U_ZERO_ERROR; form = new MessageFormat("There are {0} files on {1}", success); - if (FAILURE(success)) { + if (U_FAILURE(success)) { it_errln("Err: Message format creation failed"); it_out << "Sample message format creation failed.\n"; return; @@ -360,7 +360,7 @@ void TestMessageFormat::testStaticFormat(char* parm) result, err); - if (FAILURE(err)) { + if (U_FAILURE(err)) { errln("TestMessageFormat::testStaticFormat #1"); logln(UnicodeString("TestMessageFormat::testStaticFormat failed test #1 with error code ")+(int32_t)err); return; @@ -392,14 +392,14 @@ void TestMessageFormat::testSimpleFormat(char* parm) UnicodeString string; FieldPosition ignore(FieldPosition::DONT_CARE); form->format(testArgs1, 2, string, ignore, err); - if (FAILURE(err) || string != "The disk \"MyDisk\" contains 0 file(s).") { + if (U_FAILURE(err) || string != "The disk \"MyDisk\" contains 0 file(s).") { errln(UnicodeString("TestMessageFormat::testSimpleFormat failed on test #1")); } ignore.setField(FieldPosition::DONT_CARE); string.remove(); form->format(testArgs2, 2, string, ignore, err); - if (FAILURE(err) || string != "The disk \"MyDisk\" contains 1 file(s).") { + if (U_FAILURE(err) || string != "The disk \"MyDisk\" contains 1 file(s).") { logln(string); errln(UnicodeString("TestMessageFormat::testSimpleFormat failed on test #2")+string); } @@ -407,7 +407,7 @@ void TestMessageFormat::testSimpleFormat(char* parm) ignore.setField(FieldPosition::DONT_CARE); string.remove(); form->format(testArgs3, 2, string, ignore, err); - if (FAILURE(err) || string != "The disk \"MyDisk\" contains 12 file(s).") { + if (U_FAILURE(err) || string != "The disk \"MyDisk\" contains 12 file(s).") { errln(UnicodeString("TestMessageFormat::testSimpleFormat failed on test #3")+string); } @@ -731,7 +731,7 @@ void TestMessageFormat::testParse() UnicodeString tmp1, tmp2; Formattable* fmt_arr = msg.parse( source, count, err ); - if (FAILURE(err) || (!fmt_arr)) { + if (U_FAILURE(err) || (!fmt_arr)) { it_errln("*** MSG parse (ustring, count, err) error."); }else{ it_out << "MSG parse -- count: " << count << endl; diff --git a/icu4c/source/test/intltest/trcoll.cpp b/icu4c/source/test/intltest/trcoll.cpp index 265d08fa4a0..5f8617309a5 100644 --- a/icu4c/source/test/intltest/trcoll.cpp +++ b/icu4c/source/test/intltest/trcoll.cpp @@ -92,7 +92,7 @@ void CollationTurkishTest::doTest( UnicodeString source, UnicodeString target, C UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status ); myCollation->getCollationKey(target, /*nos*/ sortKey2, key2status ); - if (FAILURE(key1status) || FAILURE(key2status)) { + if (U_FAILURE(key1status) || U_FAILURE(key2status)) { errln("SortKey generation Failed.\n"); return; } diff --git a/icu4c/source/test/intltest/tsdate.cpp b/icu4c/source/test/intltest/tsdate.cpp index 1c251641f55..c909273affc 100644 --- a/icu4c/source/test/intltest/tsdate.cpp +++ b/icu4c/source/test/intltest/tsdate.cpp @@ -155,7 +155,7 @@ void IntlTestDateFormat::tryDate(UDate theDate) UErrorCode status = U_ZERO_ERROR; if (i == 0) date[i] = theDate; else date[i] = fFormat->parse(string[i-1], status); - if (FAILURE(status)) + if (U_FAILURE(status)) { describeTest(); errln("********** FAIL: Parse of " + string[i-1] + " failed."); diff --git a/icu4c/source/test/intltest/tsdcfmsy.cpp b/icu4c/source/test/intltest/tsdcfmsy.cpp index 886f250ed2e..2e4793fbe22 100644 --- a/icu4c/source/test/intltest/tsdcfmsy.cpp +++ b/icu4c/source/test/intltest/tsdcfmsy.cpp @@ -40,13 +40,13 @@ void IntlTestDecimalFormatSymbols::testSymbols(char *par) UErrorCode status = U_ZERO_ERROR; DecimalFormatSymbols fr(Locale::FRENCH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Couldn't create French DecimalFormatSymbols"); } status = U_ZERO_ERROR; DecimalFormatSymbols en(Locale::ENGLISH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Couldn't create English DecimalFormatSymbols"); } diff --git a/icu4c/source/test/intltest/tsdtfmsy.cpp b/icu4c/source/test/intltest/tsdtfmsy.cpp index 8aaa50e4f81..bfd66f7e969 100644 --- a/icu4c/source/test/intltest/tsdtfmsy.cpp +++ b/icu4c/source/test/intltest/tsdtfmsy.cpp @@ -71,13 +71,13 @@ void IntlTestDateFormatSymbols::testSymbols(char *par) UErrorCode status = U_ZERO_ERROR; DateFormatSymbols fr(Locale::FRENCH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Couldn't create French DateFormatSymbols"); } status = U_ZERO_ERROR; DateFormatSymbols en(Locale::ENGLISH, status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln("ERROR: Couldn't create English DateFormatSymbols"); } diff --git a/icu4c/source/test/intltest/tsmthred.cpp b/icu4c/source/test/intltest/tsmthred.cpp index c1e5ad989c9..f025f6ad77e 100644 --- a/icu4c/source/test/intltest/tsmthred.cpp +++ b/icu4c/source/test/intltest/tsmthred.cpp @@ -538,7 +538,7 @@ void formatErrorMessage(UErrorCode &realStatus, const UnicodeString& pattern, co UErrorCode inStatus0, /* statusString 1 */ const Locale &inCountry2, double currency3, // these numbers are the message arguments. UnicodeString &result) { - if(FAILURE(realStatus)) + if(U_FAILURE(realStatus)) return; // you messed up UnicodeString errString1; @@ -558,7 +558,7 @@ void formatErrorMessage(UErrorCode &realStatus, const UnicodeString& pattern, co fmt->setLocale(theLocale); fmt->applyPattern(pattern, realStatus); - if (FAILURE(realStatus)) { + if (U_FAILURE(realStatus)) { delete fmt; return; } @@ -587,7 +587,7 @@ public: UErrorCode status = U_ZERO_ERROR; NumberFormat *formatter = NumberFormat::createInstance(Locale::ENGLISH,status); - if(FAILURE(status)) + if(U_FAILURE(status)) { error("Error on NumberFormat::createInstance()"); return; @@ -595,7 +595,7 @@ public: NumberFormat *percentFormatter = NumberFormat::createPercentInstance(Locale::FRENCH,status); - if(FAILURE(status)) + if(U_FAILURE(status)) { error("Error on NumberFormat::createPercentInstance()"); delete formatter; @@ -670,7 +670,7 @@ public: UnicodeString result; UErrorCode status = U_ZERO_ERROR; formatErrorMessage(status,patternToCheck,messageLocale,statusToCheck,countryToCheck,currencyToCheck,result); - if(FAILURE(status)) + if(U_FAILURE(status)) { UnicodeString tmp; errorToString(status,tmp); diff --git a/icu4c/source/test/intltest/tsnmfmt.cpp b/icu4c/source/test/intltest/tsnmfmt.cpp index 35a4d98874b..1170335880e 100644 --- a/icu4c/source/test/intltest/tsnmfmt.cpp +++ b/icu4c/source/test/intltest/tsnmfmt.cpp @@ -88,7 +88,7 @@ IntlTestNumberFormat::testLocale(char* par, const Locale& locale, const UnicodeS void IntlTestNumberFormat::testFormat(char *par) { - if (FAILURE(fStatus)) + if (U_FAILURE(fStatus)) { errln((UnicodeString)"********** FAIL: createXxxInstance failed."); if (fFormat != 0) errln("********** FAIL: Non-null format returned by createXxxInstance upon failure."); @@ -211,7 +211,7 @@ IntlTestNumberFormat::tryIt(double aNumber) UErrorCode status = U_ZERO_ERROR; if (i == 0) number[i].setDouble(aNumber); else fFormat->parse(string[i-1], number[i], status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("********** FAIL: Parse of " + string[i-1] + " failed."); dump = TRUE; @@ -279,7 +279,7 @@ IntlTestNumberFormat::tryIt(int32_t aNumber) UErrorCode status = U_ZERO_ERROR; if (i == 0) number[i].setLong(aNumber); else fFormat->parse(string[i-1], number[i], status); - if (FAILURE(status)) + if (U_FAILURE(status)) { errln("********** FAIL: Parse of " + string[i-1] + " failed."); dump = TRUE; diff --git a/icu4c/source/test/intltest/tzregts.cpp b/icu4c/source/test/intltest/tzregts.cpp index 73dda9aee7b..09702fc7a17 100644 --- a/icu4c/source/test/intltest/tzregts.cpp +++ b/icu4c/source/test/intltest/tzregts.cpp @@ -53,7 +53,7 @@ TimeZoneRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, bool_t TimeZoneRegressionTest::failure(UErrorCode status, const char* msg) { - if(FAILURE(status)) { + if(U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + msg + " failed, error " + errorName(status)); return TRUE; } @@ -102,17 +102,17 @@ void TimeZoneRegressionTest:: Test4073215() errln("Fail: DST not active"); GregorianCalendar *cal = new GregorianCalendar(97, Calendar::JANUARY, 31, status); failure(status, "new GregorianCalendar"); - if (z->inDaylightTime(cal->getTime(status), status) || FAILURE(status) ) { + if (z->inDaylightTime(cal->getTime(status), status) || U_FAILURE(status) ) { errln("Fail: DST not working as expected"); } cal->set(97, Calendar::MARCH, 1); failure(status, "GregorianCalendar->set()"); - if (! z->inDaylightTime(cal->getTime(status), status) || FAILURE(status) ) { + if (! z->inDaylightTime(cal->getTime(status), status) || U_FAILURE(status) ) { errln("Fail: DST not working as expected"); } cal->set(97, Calendar::MARCH, 31); failure(status, "GregorianCalendar->set()"); - if (z->inDaylightTime(cal->getTime(status), status) || FAILURE(status)) { + if (z->inDaylightTime(cal->getTime(status), status) || U_FAILURE(status)) { errln("Fail: DST not working as expected"); } @@ -278,12 +278,12 @@ TimeZoneRegressionTest::checkCalendar314(GregorianCalendar *testCal, TimeZone *t int32_t date = testCal->get(Calendar::DATE, status); int32_t dow = testCal->get(Calendar::DAY_OF_WEEK, status); while(millis < 0) { - millis += kMillisPerDay; + millis += U_MILLIS_PER_DAY; --date; dow = Calendar::SUNDAY + ((dow - Calendar::SUNDAY + 6) % 7); } - while (millis >= kMillisPerDay) { - millis -= kMillisPerDay; + while (millis >= U_MILLIS_PER_DAY) { + millis -= U_MILLIS_PER_DAY; ++date; dow = Calendar::SUNDAY + ((dow - Calendar::SUNDAY + 1) % 7); } @@ -365,7 +365,7 @@ void TimeZoneRegressionTest:: Test4126678() cal->set(1998 - 1900, Calendar::APRIL, 5, 10, 0); //Date dt = new Date(1998-1900, Calendar::APRIL, 5, 10, 0); - if (! tz->inDaylightTime(cal->getTime(status), status) || FAILURE(status)) + if (! tz->inDaylightTime(cal->getTime(status), status) || U_FAILURE(status)) errln("We're not in Daylight Savings Time and we should be.\n"); //cal.setTime(dt); @@ -449,7 +449,7 @@ void TimeZoneRegressionTest:: Test4154537() { // tzb differs from tza SimpleTimeZone *tzb = new SimpleTimeZone(0, "b", 0, 1, 0, 0, 3, 1, 0, 0, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't create TimeZones"); if (tz1->useDaylightTime() || tz2->useDaylightTime() || @@ -524,7 +524,7 @@ void TimeZoneRegressionTest:: Test4154542() //} catch (IllegalArgumentException e) { // ex = e; //} - if (SUCCESS(status) != shouldBeGood) { + if (U_SUCCESS(status) != shouldBeGood) { errln(UnicodeString("setStartRule(month=") + month + ", day=" + day + ", dayOfWeek=" + dayOfWeek + ", time=" + time + (shouldBeGood ? (") should work") @@ -538,7 +538,7 @@ void TimeZoneRegressionTest:: Test4154542() //} catch (IllegalArgumentException e) { // ex = e; //} - if (SUCCESS(status) != shouldBeGood) { + if (U_SUCCESS(status) != shouldBeGood) { errln(UnicodeString("setEndRule(month=") + month + ", day=" + day + ", dayOfWeek=" + dayOfWeek + ", time=" + time + (shouldBeGood ? (") should work") @@ -556,7 +556,7 @@ void TimeZoneRegressionTest:: Test4154542() //} catch (IllegalArgumentException e) { // ex = e; //} - if (SUCCESS(status) != shouldBeGood) { + if (U_SUCCESS(status) != shouldBeGood) { errln(UnicodeString("SimpleTimeZone(month=") + month + ", day=" + day + ", dayOfWeek=" + dayOfWeek + ", time=" + time + (shouldBeGood ? (", ) should work")// + ex) @@ -574,7 +574,7 @@ void TimeZoneRegressionTest:: Test4154542() //} catch (IllegalArgumentException e) { // ex = e; //} - if (SUCCESS(status) != shouldBeGood) { + if (U_SUCCESS(status) != shouldBeGood) { errln(UnicodeString("SimpleTimeZone(, month=") + month + ", day=" + day + ", dayOfWeek=" + dayOfWeek + ", time=" + time + (shouldBeGood ? (") should work")// + ex) @@ -626,7 +626,7 @@ TimeZoneRegressionTest::Test4154525() break; } - if(FAILURE(status)) { + if(U_FAILURE(status)) { if(valid) { errln(UnicodeString("Fail: DST savings of ") + savings + " to " + method + " gave " + errorName(status)); } @@ -701,7 +701,7 @@ TimeZoneRegressionTest::Test4154650() //} catch (IllegalArgumentException ex) { // e = ex; //} - if(good != SUCCESS(status)) { + if(good != U_SUCCESS(status)) { errln(UnicodeString("Fail: getOffset(") + DATA[i+1] + ", " + DATA[i+2] + ", " + DATA[i+3] + ", " + DATA[i+4] + ", " + DATA[i+5] + ", " + DATA[i+6] + @@ -819,7 +819,7 @@ TimeZoneRegressionTest::TestJDK12API() // verify error checking int32_t offset3 = pst->getOffset(1, 1997, (Calendar::EDateFields)-1, 26, Calendar::SUNDAY, (2*60*60*1000), status); - if(SUCCESS(status)) + if(U_SUCCESS(status)) errln("FAILURE: getOffset() succeeded with -1 for month"); status = U_ZERO_ERROR; diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 33a70fd655a..d04c0a7ad90 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -327,17 +327,17 @@ TimeZoneTest::TestVariousAPI518() UnicodeString str; logln("The timezone is " + time_zone->getID(str)); if (!time_zone->inDaylightTime(d, status)) errln("FAIL: inDaylightTime returned FALSE"); - if (FAILURE(status)) { errln("FAIL: TimeZone::inDaylightTime failed"); return; } + if (U_FAILURE(status)) { errln("FAIL: TimeZone::inDaylightTime failed"); return; } if (!time_zone->useDaylightTime()) errln("FAIL: useDaylightTime returned FALSE"); if (time_zone->getRawOffset() != - 8 * millisPerHour) errln("FAIL: getRawOffset returned wrong value"); GregorianCalendar *gc = new GregorianCalendar(status); - if (FAILURE(status)) { errln("FAIL: Couldn't create GregorianCalendar"); return; } + if (U_FAILURE(status)) { errln("FAIL: Couldn't create GregorianCalendar"); return; } gc->setTime(d, status); - if (FAILURE(status)) { errln("FAIL: GregorianCalendar::setTime failed"); return; } + if (U_FAILURE(status)) { errln("FAIL: GregorianCalendar::setTime failed"); return; } if (time_zone->getOffset(gc->AD, gc->get(gc->YEAR, status), gc->get(gc->MONTH, status), gc->get(gc->DAY_OF_MONTH, status), (uint8_t)gc->get(gc->DAY_OF_WEEK, status), 0) != - 7 * millisPerHour) errln("FAIL: getOffset returned wrong value"); - if (FAILURE(status)) { errln("FAIL: GregorianCalendar::set failed"); return; } + if (U_FAILURE(status)) { errln("FAIL: GregorianCalendar::set failed"); return; } delete gc; delete time_zone; } @@ -906,7 +906,7 @@ TimeZoneTest::TestDisplayName() UnicodeString inDaylight = (zone2->inDaylightTime(UDate(), status)? UnicodeString("TRUE"):UnicodeString("FALSE")); logln(UnicodeString("Modified PST inDaylightTime->") + inDaylight ); - if(FAILURE(status)) + if(U_FAILURE(status)) { errln("Some sort of error..."); // REVISIT } @@ -933,15 +933,15 @@ TimeZoneTest::TestDisplayName() // If not, we expect the en fallback behavior. ResourceBundle enRB(Locale::getDataDirectory(), Locale::ENGLISH, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("Couldn't get ResourceBundle for en"); ResourceBundle zhRB(Locale::getDataDirectory(), zh_CN, status); - //if(FAILURE(status)) + //if(U_FAILURE(status)) // errln("Couldn't get ResourceBundle for zh_CN"); - bool_t noZH = FAILURE(status); + bool_t noZH = U_FAILURE(status); if (noZH) { logln("Warning: Not testing the zh_CN behavior because resource is absent"); @@ -987,45 +987,45 @@ TimeZoneTest::TestDSTSavings() // It might be better to find a way to integrate this test into the main TimeZone // tests above, but I don't have time to figure out how to do this (or if it's // even really a good idea). Let's consider that a future. --rtg 1/27/98 - SimpleTimeZone *tz = new SimpleTimeZone(-5 * kMillisPerHour, "dstSavingsTest", + SimpleTimeZone *tz = new SimpleTimeZone(-5 * U_MILLIS_PER_HOUR, "dstSavingsTest", Calendar::MARCH, 1, 0, 0, Calendar::SEPTEMBER, 1, 0, 0, - (int32_t)(0.5 * kMillisPerHour), status); - if(FAILURE(status)) + (int32_t)(0.5 * U_MILLIS_PER_HOUR), status); + if(U_FAILURE(status)) errln("couldn't create TimeZone"); - if (tz->getRawOffset() != -5 * kMillisPerHour) - errln(UnicodeString("Got back a raw offset of ") + (tz->getRawOffset() / kMillisPerHour) + + if (tz->getRawOffset() != -5 * U_MILLIS_PER_HOUR) + errln(UnicodeString("Got back a raw offset of ") + (tz->getRawOffset() / U_MILLIS_PER_HOUR) + " hours instead of -5 hours."); if (!tz->useDaylightTime()) errln("Test time zone should use DST but claims it doesn't."); - if (tz->getDSTSavings() != 0.5 * kMillisPerHour) + if (tz->getDSTSavings() != 0.5 * U_MILLIS_PER_HOUR) errln(UnicodeString("Set DST offset to 0.5 hour, but got back ") + (tz->getDSTSavings() / - kMillisPerHour) + " hours instead."); + U_MILLIS_PER_HOUR) + " hours instead."); int32_t offset = tz->getOffset(GregorianCalendar::AD, 1998, Calendar::JANUARY, 1, - Calendar::THURSDAY, 10 * kMillisPerHour); - if (offset != -5 * kMillisPerHour) + Calendar::THURSDAY, 10 * U_MILLIS_PER_HOUR); + if (offset != -5 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10 AM, 1/1/98 should have been -5 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); offset = tz->getOffset(GregorianCalendar::AD, 1998, Calendar::JUNE, 1, Calendar::MONDAY, - 10 * kMillisPerHour); - if (offset != -4.5 * kMillisPerHour) + 10 * U_MILLIS_PER_HOUR); + if (offset != -4.5 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10 AM, 6/1/98 should have been -4.5 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); - tz->setDSTSavings(kMillisPerHour); + tz->setDSTSavings(U_MILLIS_PER_HOUR); offset = tz->getOffset(GregorianCalendar::AD, 1998, Calendar::JANUARY, 1, - Calendar::THURSDAY, 10 * kMillisPerHour); - if (offset != -5 * kMillisPerHour) + Calendar::THURSDAY, 10 * U_MILLIS_PER_HOUR); + if (offset != -5 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10 AM, 1/1/98 should have been -5 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); offset = tz->getOffset(GregorianCalendar::AD, 1998, Calendar::JUNE, 1, Calendar::MONDAY, - 10 * kMillisPerHour); - if (offset != -4 * kMillisPerHour) + 10 * U_MILLIS_PER_HOUR); + if (offset != -4 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10 AM, 6/1/98 (with a 1-hour DST offset) should have been -4 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); delete tz; } @@ -1040,69 +1040,69 @@ TimeZoneTest::TestAlternateRules() // test at the top of this class, but I didn't have time to figure out how to do that. // --rtg 1/28/98 - SimpleTimeZone tz(-5 * kMillisPerHour, "alternateRuleTest"); + SimpleTimeZone tz(-5 * U_MILLIS_PER_HOUR, "alternateRuleTest"); // test the day-of-month API UErrorCode status = U_ZERO_ERROR; - tz.setStartRule(Calendar::MARCH, 10, 12 * kMillisPerHour, status); - if(FAILURE(status)) + tz.setStartRule(Calendar::MARCH, 10, 12 * U_MILLIS_PER_HOUR, status); + if(U_FAILURE(status)) errln("tz.setStartRule failed"); - tz.setEndRule(Calendar::OCTOBER, 20, 12 * kMillisPerHour, status); - if(FAILURE(status)) + tz.setEndRule(Calendar::OCTOBER, 20, 12 * U_MILLIS_PER_HOUR, status); + if(U_FAILURE(status)) errln("tz.setStartRule failed"); int32_t offset = tz.getOffset(GregorianCalendar::AD, 1998, Calendar::MARCH, 5, - Calendar::THURSDAY, 10 * kMillisPerHour); - if (offset != -5 * kMillisPerHour) + Calendar::THURSDAY, 10 * U_MILLIS_PER_HOUR); + if (offset != -5 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10AM, 3/5/98 should have been -5 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); offset = tz.getOffset(GregorianCalendar::AD, 1998, Calendar::MARCH, 15, Calendar::SUNDAY, 10 * millisPerHour); - if (offset != -4 * kMillisPerHour) + if (offset != -4 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10AM, 3/15/98 should have been -4 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); offset = tz.getOffset(GregorianCalendar::AD, 1998, Calendar::OCTOBER, 15, Calendar::THURSDAY, 10 * millisPerHour); - if (offset != -4 * kMillisPerHour) - errln(UnicodeString("The offset for 10AM, 10/15/98 should have been -4 hours, but we got ") + (offset / kMillisPerHour) + " hours."); + if (offset != -4 * U_MILLIS_PER_HOUR) + errln(UnicodeString("The offset for 10AM, 10/15/98 should have been -4 hours, but we got ") + (offset / U_MILLIS_PER_HOUR) + " hours."); offset = tz.getOffset(GregorianCalendar::AD, 1998, Calendar::OCTOBER, 25, Calendar::SUNDAY, 10 * millisPerHour); - if (offset != -5 * kMillisPerHour) + if (offset != -5 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10AM, 10/25/98 should have been -5 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); // test the day-of-week-after-day-in-month API tz.setStartRule(Calendar::MARCH, 10, Calendar::FRIDAY, 12 * millisPerHour, TRUE, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("tz.setStartRule failed"); tz.setEndRule(Calendar::OCTOBER, 20, Calendar::FRIDAY, 12 * millisPerHour, FALSE, status); - if(FAILURE(status)) + if(U_FAILURE(status)) errln("tz.setStartRule failed"); offset = tz.getOffset(GregorianCalendar::AD, 1998, Calendar::MARCH, 11, Calendar::WEDNESDAY, 10 * millisPerHour); - if (offset != -5 * kMillisPerHour) + if (offset != -5 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10AM, 3/11/98 should have been -5 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); offset = tz.getOffset(GregorianCalendar::AD, 1998, Calendar::MARCH, 14, Calendar::SATURDAY, 10 * millisPerHour); - if (offset != -4 * kMillisPerHour) + if (offset != -4 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10AM, 3/14/98 should have been -4 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); offset = tz.getOffset(GregorianCalendar::AD, 1998, Calendar::OCTOBER, 15, Calendar::THURSDAY, 10 * millisPerHour); - if (offset != -4 * kMillisPerHour) + if (offset != -4 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10AM, 10/15/98 should have been -4 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); offset = tz.getOffset(GregorianCalendar::AD, 1998, Calendar::OCTOBER, 17, Calendar::SATURDAY, 10 * millisPerHour); - if (offset != -5 * kMillisPerHour) + if (offset != -5 * U_MILLIS_PER_HOUR) errln(UnicodeString("The offset for 10AM, 10/17/98 should have been -5 hours, but we got ") - + (offset / kMillisPerHour) + " hours."); + + (offset / U_MILLIS_PER_HOUR) + " hours."); } diff --git a/icu4c/source/tools/gencol/gencol.c b/icu4c/source/tools/gencol/gencol.c index fd6670110b5..f70e6a8d519 100644 --- a/icu4c/source/tools/gencol/gencol.c +++ b/icu4c/source/tools/gencol/gencol.c @@ -99,7 +99,7 @@ main(int argc, loc = uloc_getAvailable(i); printf("gencol: Creating collation data for locale \"%s\"\n", loc); coll = ucol_open(loc, &status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { printf("gencol: %s for locale \"%s\"", errorName(status), loc); } else { diff --git a/icu4c/source/tools/genrb/genrb.c b/icu4c/source/tools/genrb/genrb.c index bfbcb9af207..d82434f3f5d 100644 --- a/icu4c/source/tools/genrb/genrb.c +++ b/icu4c/source/tools/genrb/genrb.c @@ -103,7 +103,7 @@ main(int argc, for(i = optind; i < argc; ++i) { status = U_ZERO_ERROR; processFile(argv[i], &status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { printf("genrb: %s processing file \"%s\"\n", errorName(status), argv[i]); if(getErrorText() != 0) printf(" (%s)\n", getErrorText()); @@ -145,7 +145,7 @@ processFile(const char *filename, struct SRBItemList *data; char *rbname; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* Setup */ in = rb_out = 0; @@ -163,7 +163,7 @@ processFile(const char *filename, /* Determine the target rb filename */ rbname = make_res_filename(filename, status); - if(FAILURE(*status)) { + if(U_FAILURE(*status)) { goto finish; } @@ -197,7 +197,7 @@ make_res_filename(const char *filename, char *dirname; char *resName; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* setup */ basename = dirname = resName = 0; @@ -244,7 +244,7 @@ make_col_filename(const char *filename, char *dirname; char *colName; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* setup */ basename = dirname = colName = 0; diff --git a/icu4c/source/tools/genrb/list.c b/icu4c/source/tools/genrb/list.c index cd6160613f5..2f62cb2262a 100644 --- a/icu4c/source/tools/genrb/list.c +++ b/icu4c/source/tools/genrb/list.c @@ -35,7 +35,7 @@ strlist_open(UErrorCode *status) { struct SList *list; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; list = (struct SList*) icu_malloc(sizeof(struct SList)); if(list == 0) { @@ -60,7 +60,7 @@ strlist_close(struct SList *list, { int32_t i; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eStringList) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -84,7 +84,7 @@ strlist_add(struct SList *list, { int32_t index; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eStringList) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -115,7 +115,7 @@ strlist_grow(struct SList *list, int32_t newCapacity; UChar **newData; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eStringList) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -157,7 +157,7 @@ strlist2d_open(UErrorCode *status) { struct SList *list; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; list = (struct SList*) icu_malloc(sizeof(struct SList)); if(list == 0) { @@ -178,7 +178,7 @@ strlist2d_open(UErrorCode *status) strlist2d_grow(list, status); strlist2d_growRows(list, status); - if(SUCCESS(*status)) { + if(U_SUCCESS(*status)) { list->u.fStringList2d.fRows[0] = 0; list->u.fStringList2d.fRowCount = 1; } @@ -192,7 +192,7 @@ strlist2d_close(struct SList *list, { int32_t i; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eStringList2d) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -215,7 +215,7 @@ void strlist2d_newRow(struct SList *list, UErrorCode *status) { - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eStringList2d) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -224,7 +224,7 @@ strlist2d_newRow(struct SList *list, if(list->u.fStringList2d.fRowCount == list->u.fStringList2d.fRowCapacity) strlist2d_growRows(list, status); - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; list->u.fStringList2d.fRows[(list->u.fStringList2d.fRowCount)++] = list->u.fStringList2d.fCount; } @@ -235,7 +235,7 @@ void strlist2d_add(struct SList *list, { int32_t index; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eStringList2d) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -266,7 +266,7 @@ strlist2d_grow(struct SList *list, int32_t newCapacity; UChar **newData; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eStringList2d) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -309,7 +309,7 @@ strlist2d_growRows(struct SList *list, int32_t newCapacity; int32_t *newRows; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eStringList2d) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -341,7 +341,7 @@ taglist_open(UErrorCode *status) { struct SList *list; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; list = (struct SList*) icu_malloc(sizeof(struct SList)); if(list == 0) { @@ -364,7 +364,7 @@ void taglist_close(struct SList *list, UErrorCode *status) { - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eTaggedList) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -386,7 +386,7 @@ taglist_grow(struct SList *list, int32_t newCapacity; struct SStringPair *newData; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eTaggedList) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -422,7 +422,7 @@ taglist_add(struct SList *list, int32_t index; struct SStringPair pair; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(list->fType != eTaggedList) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -461,7 +461,7 @@ taglist_get(const struct SList *list, { int32_t i; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; if(list->fType != eTaggedList) { *status = U_ILLEGAL_ARGUMENT_ERROR; diff --git a/icu4c/source/tools/genrb/parse.c b/icu4c/source/tools/genrb/parse.c index e4a98aca459..c6d363b35ec 100644 --- a/icu4c/source/tools/genrb/parse.c +++ b/icu4c/source/tools/genrb/parse.c @@ -150,7 +150,7 @@ parse(FileStream *f, struct UHashtable *data; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* setup */ @@ -167,14 +167,14 @@ parse(FileStream *f, file = u_finit(f, status); list = rblist_open(status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; /* iterate through the stream */ for(;;) { /* get next token from stream */ type = getNextToken(file, &token, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; switch(type) { case tok_EOF: @@ -207,7 +207,7 @@ parse(FileStream *f, /* Record the last string as the tag name */ case eSetTag: ustr_cpy(&tag, &token, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; if(uhash_get(data, uhash_hashUString(tag.fChars)) != 0) { char *s; *status = U_INVALID_FORMAT_ERROR; @@ -230,7 +230,7 @@ parse(FileStream *f, item = make_rbitem(tag.fChars, current, status); rblist_add(list, item, status); uhash_put(data, tag.fChars, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; current = 0; item = 0; break; @@ -243,13 +243,13 @@ parse(FileStream *f, } current = strlist_open(status); strlist_add(current, token.fChars, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; break; /* Record a comma-delimited list string */ case eListStr: strlist_add(current, token.fChars, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; break; /* End a string list */ @@ -257,7 +257,7 @@ parse(FileStream *f, uhash_put(data, tag.fChars, status); item = make_rbitem(tag.fChars, current, status); rblist_add(list, item, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; current = 0; item = 0; break; @@ -268,26 +268,26 @@ parse(FileStream *f, goto finish; } current = strlist2d_open(status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; break; case eEnd2dList: uhash_put(data, tag.fChars, status); item = make_rbitem(tag.fChars, current, status); rblist_add(list, item, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; current = 0; item = 0; break; case e2dStr: strlist2d_add(current, token.fChars, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; break; case eNewRow: strlist2d_newRow(current, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; break; case eBegTagged: @@ -297,27 +297,27 @@ parse(FileStream *f, } current = taglist_open(status); ustr_cpy(&subtag, &token, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; break; case eEndTagged: uhash_put(data, tag.fChars, status); item = make_rbitem(tag.fChars, current, status); rblist_add(list, item, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; current = 0; item = 0; break; case eTaggedStr: taglist_add(current, subtag.fChars, token.fChars, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; break; /* Record the last string as the subtag */ case eSubtag: ustr_cpy(&subtag, &token, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; if(taglist_get(current, subtag.fChars, status) != 0) { *status = U_INVALID_FORMAT_ERROR; setErrorText("Duplicate subtag found in tagged list"); @@ -332,7 +332,7 @@ parse(FileStream *f, } ustr_cpy(&localeName, &token, status); rblist_setlocale(list, localeName.fChars, status); - if(FAILURE(*status)) goto finish; + if(U_FAILURE(*status)) goto finish; data = uhash_open(uhash_hashUString, status); break; diff --git a/icu4c/source/tools/genrb/rblist.c b/icu4c/source/tools/genrb/rblist.c index ab276c7c68d..45680cfb53c 100644 --- a/icu4c/source/tools/genrb/rblist.c +++ b/icu4c/source/tools/genrb/rblist.c @@ -34,7 +34,7 @@ make_rbitem(const UChar *tag, struct SRBItem *item; UChar *s; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; item = (struct SRBItem*) icu_malloc(sizeof(struct SRBItem)); if(item == 0) { @@ -60,7 +60,7 @@ rblist_open(UErrorCode *status) { struct SRBItemList *list; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; list = (struct SRBItemList*) icu_malloc(sizeof(struct SRBItemList)); if(list == 0) { @@ -84,7 +84,7 @@ void rblist_close(struct SRBItemList *list, { int32_t i; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* deallocate each list */ for(i = 0; i < list->fCount; ++i) { @@ -116,7 +116,7 @@ void rblist_setlocale(struct SRBItemList *list, const UChar *locale, UErrorCode *status) { - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* Allocate enough space */ list->fLocale = (UChar*) icu_realloc(list->fLocale, @@ -135,7 +135,7 @@ void rblist_add(struct SRBItemList *list, { int32_t index; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; index = list->fCount; @@ -154,7 +154,7 @@ rblist_grow(struct SRBItemList *list, int32_t newCapacity; struct SRBItem **newData; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; newCapacity = list->fCapacity << 1; diff --git a/icu4c/source/tools/genrb/read.c b/icu4c/source/tools/genrb/read.c index 1590bae7b0c..d7d9371b091 100644 --- a/icu4c/source/tools/genrb/read.c +++ b/icu4c/source/tools/genrb/read.c @@ -59,11 +59,11 @@ enum ETokenType getNextToken(UFILE *f, { UChar c; - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; /* Skip whitespace */ c = getNextChar(f, TRUE, status); - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; switch(c) { case OPENBRACE: return tok_open_brace; @@ -98,20 +98,20 @@ static enum ETokenType getStringToken(UFILE *f, doesn't matter; we still want to validly return the initialChar (if nothing else) as a string token. */ - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; /* setup */ lastStringWasQuoted = FALSE; c = initialChar; ustr_setlen(token, 0, status); - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; for(;;) { if(c == QUOTE) { if( ! lastStringWasQuoted && token->fLength > 0) { ustr_ucat(token, SPACE, status); - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; } lastStringWasQuoted = TRUE; @@ -120,31 +120,31 @@ static enum ETokenType getStringToken(UFILE *f, /* EOF reached */ if(c == (UChar)U_EOF) return tok_EOF; /* Unterminated quoted strings */ - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; if(c == QUOTE) break; if(c == ESCAPE) c = unescape(f, status); ustr_ucat(token, c, status); - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; } } else { if(token->fLength > 0) { ustr_ucat(token, SPACE, status); - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; } lastStringWasQuoted = FALSE; if(c == ESCAPE) c = unescape(f, status); ustr_ucat(token, c, status); - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; for(;;) { /* DON'T skip whitespace */ c = getNextChar(f, FALSE, status); - if(FAILURE(*status)) + if(U_FAILURE(*status)) return tok_string; if(c == QUOTE @@ -162,13 +162,13 @@ static enum ETokenType getStringToken(UFILE *f, if(c == ESCAPE) c = unescape(f, status); ustr_ucat(token, c, status); - if(FAILURE(*status)) return tok_error; + if(U_FAILURE(*status)) return tok_error; } } /* DO skip whitespace */ c = getNextChar(f, TRUE, status); - if(FAILURE(*status)) + if(U_FAILURE(*status)) return tok_string; if(c == OPENBRACE || c == CLOSEBRACE || c == COMMA) { @@ -186,7 +186,7 @@ static UChar getNextChar(UFILE *f, { UChar c; - if(FAILURE(*status)) return U_EOF; + if(U_FAILURE(*status)) return U_EOF; for(;;) { c = u_fgetc(f, status); @@ -225,13 +225,13 @@ void seekUntilNewline(UFILE *f, { UChar c; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; do { c = u_fgetc(f, status); } while(! isNewline(c) && c != (UChar)U_EOF && *status == U_ZERO_ERROR); - /*if(FAILURE(*status)) + /*if(U_FAILURE(*status)) err = kItemNotFound;*/ } @@ -240,7 +240,7 @@ void seekUntilEndOfComment(UFILE *f, { UChar c, d; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; do { c = u_fgetc(f, status); @@ -266,10 +266,10 @@ static UChar unescape(UFILE *f, UChar out; int16_t maxChars; - if(FAILURE(*status)) return U_EOF; + if(U_FAILURE(*status)) return U_EOF; c = u_fgetc(f, status); - if(c == (UChar)U_EOF || FAILURE(*status)) return U_EOF; + if(c == (UChar)U_EOF || U_FAILURE(*status)) return U_EOF; switch (c) { @@ -300,7 +300,7 @@ static UChar unescape(UFILE *f, out = 0; while(maxChars != 0 && *status == U_ZERO_ERROR) { c = u_fgetc(f, status); - if(c == (UChar)U_EOF || FAILURE(*status)) return U_EOF; + if(c == (UChar)U_EOF || U_FAILURE(*status)) return U_EOF; switch(c) { /* '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' */ diff --git a/icu4c/source/tools/genrb/ufile.c b/icu4c/source/tools/genrb/ufile.c index c3cb3c27601..4f93597e536 100644 --- a/icu4c/source/tools/genrb/ufile.c +++ b/icu4c/source/tools/genrb/ufile.c @@ -43,7 +43,7 @@ u_finit(FileStream *f, result->fUCLimit = result->fUCBuffer; result->fConverter = ucnv_open(0, status); - if(FAILURE(*status) || result->fConverter == 0) { + if(U_FAILURE(*status) || result->fConverter == 0) { T_FileStream_close(result->fFile); icu_free(result); return 0; @@ -76,7 +76,7 @@ ufile_fill_uchar_buffer(UFILE *f, int32_t availLength; int32_t dataSize; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* shift the buffer if it isn't empty */ dataSize = f->fUCLimit - f->fUCPos; diff --git a/icu4c/source/tools/genrb/ustdio.c b/icu4c/source/tools/genrb/ustdio.c index 5fd4f233686..d9ee333d7bb 100644 --- a/icu4c/source/tools/genrb/ustdio.c +++ b/icu4c/source/tools/genrb/ustdio.c @@ -43,7 +43,7 @@ u_fputs(const UChar *s, { int32_t count; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; count = u_file_write(s, u_strlen(s), f, status); count += u_file_write(DELIMITERS, u_strlen(DELIMITERS), f, status); @@ -55,7 +55,7 @@ u_fputc(UChar uc, UFILE *f, UErrorCode *status) { - if(FAILURE(*status)) return U_EOF; + if(U_FAILURE(*status)) return U_EOF; return u_file_write(&uc, 1, f, status) == 1 ? uc : U_EOF; } @@ -74,7 +74,7 @@ u_file_write(const UChar *chars, int32_t bufferSize = UFILE_CHARBUFFER_SIZE; int32_t written = 0; - if(FAILURE(*status)) return U_EOF; + if(U_FAILURE(*status)) return U_EOF; /* Perform the conversion in a loop */ do { @@ -115,7 +115,7 @@ u_fgets(UFILE *f, int32_t count; UChar *alias; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* subtract 1 from n to compensate for the terminator */ --n; @@ -145,7 +145,7 @@ u_fgets(UFILE *f, /* refill the buffer */ ufile_fill_uchar_buffer(f, status); - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* skip over any remaining delimiters */ while(IS_STRING_DELIMITER(*(f->fUCPos)) && f->fUCPos < f->fUCLimit) @@ -161,7 +161,7 @@ u_fgets(UFILE *f, /* refill the buffer */ ufile_fill_uchar_buffer(f, status); - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* determine the amount of data in the buffer */ dataSize = f->fUCLimit - f->fUCPos; @@ -188,7 +188,7 @@ u_fgets(UFILE *f, /* refill the buffer */ ufile_fill_uchar_buffer(f, status); - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* skip over any remaining delimiters */ while(IS_STRING_DELIMITER(*(f->fUCPos)) && f->fUCPos < f->fUCLimit) @@ -213,7 +213,7 @@ UChar u_fgetc(UFILE *f, UErrorCode *status) { - if(FAILURE(*status)) return U_EOF; + if(U_FAILURE(*status)) return U_EOF; /* if we have an available character in the buffer, return it */ if(f->fUCPos < f->fUCLimit) @@ -221,7 +221,7 @@ u_fgetc(UFILE *f, /* otherwise, fill the buffer and return the next character */ else { ufile_fill_uchar_buffer(f, status); - if(FAILURE(*status)) return U_EOF; + if(U_FAILURE(*status)) return U_EOF; if(f->fUCPos < f->fUCLimit) { return *(f->fUCPos)++; } @@ -237,7 +237,7 @@ u_fungetc(UChar c, UFILE *f, UErrorCode *status) { - if(FAILURE(*status)) return U_EOF; + if(U_FAILURE(*status)) return U_EOF; /* if we're at the beginning of the buffer, sorry! */ if(f->fUCPos == f->fUCBuffer) { @@ -260,7 +260,7 @@ u_file_read(UChar *chars, int32_t dataSize; int32_t read; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* determine the amount of data in the buffer */ dataSize = f->fUCLimit - f->fUCPos; @@ -282,7 +282,7 @@ u_file_read(UChar *chars, /* refill the buffer */ ufile_fill_uchar_buffer(f, status); - if(FAILURE(*status)) return read; + if(U_FAILURE(*status)) return read; /* determine the amount of data in the buffer */ dataSize = f->fUCLimit - f->fUCPos; diff --git a/icu4c/source/tools/genrb/ustr.c b/icu4c/source/tools/genrb/ustr.c index d95ff4b9962..2bb2feb7ec8 100644 --- a/icu4c/source/tools/genrb/ustr.c +++ b/icu4c/source/tools/genrb/ustr.c @@ -47,11 +47,11 @@ ustr_cpy(struct UString *dst, const struct UString *src, UErrorCode *status) { - if(FAILURE(*status) || dst == src) return; + if(U_FAILURE(*status) || dst == src) return; if(dst->fCapacity < src->fLength) { ustr_resize(dst, ALLOCATION(src->fLength), status); - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; } icu_memcpy(dst->fChars, src->fChars, sizeof(UChar) * src->fLength); @@ -64,11 +64,11 @@ ustr_setlen(struct UString *s, int32_t len, UErrorCode *status) { - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(s->fCapacity < (len + 1)) { ustr_resize(s, ALLOCATION(len), status); - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; } s->fLength = len; @@ -89,11 +89,11 @@ ustr_ncat(struct UString *dst, int32_t n, UErrorCode *status) { - if(FAILURE(*status) || dst == src) return; + if(U_FAILURE(*status) || dst == src) return; if(dst->fCapacity < (dst->fLength + n)) { ustr_resize(dst, ALLOCATION(dst->fLength + n), status); - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; } icu_memcpy(dst->fChars + dst->fLength, src->fChars, @@ -107,11 +107,11 @@ ustr_ucat(struct UString *dst, UChar c, UErrorCode *status) { - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; if(dst->fCapacity < (dst->fLength + 1)) { ustr_resize(dst, ALLOCATION(dst->fLength + 1), status); - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; } icu_memcpy(dst->fChars + dst->fLength, &c, @@ -126,7 +126,7 @@ ustr_resize(struct UString *s, int32_t len, UErrorCode *status) { - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* +1 for trailing 0x0000 */ s->fChars = (UChar*) icu_realloc(s->fChars, sizeof(UChar) * (len + 1)); diff --git a/icu4c/source/tools/genrb/write.c b/icu4c/source/tools/genrb/write.c index c88146dca05..791002bc3ef 100644 --- a/icu4c/source/tools/genrb/write.c +++ b/icu4c/source/tools/genrb/write.c @@ -157,7 +157,7 @@ rb_write(FileStream *f, int32_t i; struct SRBItem *item; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* Write the byte order mark to the file */ T_FileStream_write(f, &sBOM, sizeof(sBOM)); diff --git a/icu4c/source/tools/makeconv/makeconv.c b/icu4c/source/tools/makeconv/makeconv.c index 6b949c3bd50..b682f0249ea 100644 --- a/icu4c/source/tools/makeconv/makeconv.c +++ b/icu4c/source/tools/makeconv/makeconv.c @@ -21,6 +21,7 @@ #include "ucnv_io.h" #include "ucnv_bld.h" #include "ucnv_err.h" +#include "ucnv_imp.h" #include "cstring.h" #include "cmemory.h" #include "filestrm.h" @@ -61,7 +62,7 @@ static void writeUConverterSharedDataToFile(const char* filename, UConverterSharedData* mySharedData, UErrorCode* err); -static UCNV_PLATFORM getPlatformFromName(char* name); +static UConverterPlatform getPlatformFromName(char* name); static int32_t getCodepageNumberFromName(char* name); @@ -76,7 +77,7 @@ int main(int argc, char** argv) { UConverterSharedData* mySharedData = NULL; UErrorCode err = U_ZERO_ERROR; - char outFileName[MAX_FULL_FILE_NAME_LENGTH]; + char outFileName[UCNV_MAX_FULL_FILE_NAME_LENGTH]; char* dot = NULL; @@ -97,7 +98,7 @@ int main(int argc, char** argv) icu_strcat(outFileName, CONVERTER_FILE_EXTENSION); mySharedData = createConverterFromTableFile(argv[argc], &err); - if (FAILURE(err) || (mySharedData == NULL)) + if (U_FAILURE(err) || (mySharedData == NULL)) { /* in an error is found, print out a error msg and keep going*/ printf("Error creating \"%s\" file for \"%s\" (error code %d)\n", outFileName, argv[argc], err); @@ -178,11 +179,11 @@ void writeUConverterSharedDataToFile(const char* filename, const uint16_t* myIndexArray = NULL; int32_t myValuesCount = 0; int32_t myIndexCount = 0; - int32_t myCheck = FILE_CHECK_MARKER; + int32_t myCheck = UCNV_FILE_CHECK_MARKER; FileStream* outfile = NULL; - ConverterTable* myTableAlias = NULL; + UConverterTable* myTableAlias = NULL; - if (FAILURE(*err)) return; + if (U_FAILURE(*err)) return; outfile = T_FileStream_open(filename, "wb"); if (outfile == NULL) @@ -193,7 +194,7 @@ void writeUConverterSharedDataToFile(const char* filename, /*Writes a Sentinel value*/ T_FileStream_write(outfile, &myCheck, sizeof(int32_t)); - T_FileStream_write(outfile, COPYRIGHT_STRING, COPYRIGHT_STRING_LENGTH); + T_FileStream_write(outfile, UCNV_COPYRIGHT_STRING, UCNV_COPYRIGHT_STRING_LENGTH); /*Writes NULL in places where there is a pointer in order *to enable bitwise equivalence of binary files @@ -205,17 +206,17 @@ void writeUConverterSharedDataToFile(const char* filename, switch (mySharedData->conversionType) { - case SBCS : + case UCNV_SBCS : { T_FileStream_write(outfile, mySharedData->table->sbcs.toUnicode, 256*sizeof(UChar)); writeCompactByteArrayToFile(outfile, mySharedData->table->sbcs.fromUnicode); }break; - case DBCS : case EBCDIC_STATEFUL: + case UCNV_DBCS : case UCNV_EBCDIC_STATEFUL: { writeCompactShortArrayToFile(outfile, mySharedData->table->dbcs.toUnicode); writeCompactShortArrayToFile(outfile, mySharedData->table->dbcs.fromUnicode); }break; - case MBCS : + case UCNV_MBCS : { T_FileStream_write(outfile, mySharedData->table->mbcs.starters, 256*sizeof(bool_t)); writeCompactShortArrayToFile(outfile, mySharedData->table->mbcs.toUnicode); @@ -232,18 +233,18 @@ void writeUConverterSharedDataToFile(const char* filename, } -void copyPlatformString(char* platformString, UCNV_PLATFORM pltfrm) +void copyPlatformString(char* platformString, UConverterPlatform pltfrm) { switch (pltfrm) { - case IBM: {icu_strcpy(platformString, "ibm");break;} + case UCNV_IBM: {icu_strcpy(platformString, "ibm");break;} default: {icu_strcpy(platformString, "");break;} }; return; } -UCNV_PLATFORM getPlatformFromName(char* name) +UConverterPlatform getPlatformFromName(char* name) { char myPlatform[10]; char mySeparators[2] = { '-', '\0' }; @@ -251,8 +252,8 @@ UCNV_PLATFORM getPlatformFromName(char* name) getToken(myPlatform, name, mySeparators); strtoupper(myPlatform); - if (icu_strcmp(myPlatform, "IBM") == 0) return IBM; - else return UNKNOWN; + if (icu_strcmp(myPlatform, "IBM") == 0) return UCNV_IBM; + else return UCNV_UNKNOWN; } int32_t getCodepageNumberFromName(char* name) @@ -272,7 +273,7 @@ void readHeaderFromFile(UConverter* myConverter, FileStream* convFile, UErrorCode* err) { - char storeLine[MAX_LINE_TEXT]; + char storeLine[UCNV_MAX_LINE_TEXT]; char key[15]; char value[30]; char* line = storeLine; @@ -281,8 +282,8 @@ void readHeaderFromFile(UConverter* myConverter, bool_t hasSubChar = FALSE; char codepointByte[3]; - if (FAILURE(*err)) return; - while (!endOfHeader && T_FileStream_readLine(convFile, line, MAX_LINE_TEXT)) + if (U_FAILURE(*err)) return; + while (!endOfHeader && T_FileStream_readLine(convFile, line, UCNV_MAX_LINE_TEXT)) { removeComments(line); @@ -322,19 +323,19 @@ void readHeaderFromFile(UConverter* myConverter, hasConvClass = TRUE; if (icu_strcmp(value, "DBCS") == 0) { - myConverter->sharedData->conversionType = DBCS; + myConverter->sharedData->conversionType = UCNV_DBCS; } else if (icu_strcmp(value, "SBCS") == 0) { - myConverter->sharedData->conversionType = SBCS; + myConverter->sharedData->conversionType = UCNV_SBCS; } else if (icu_strcmp(value, "MBCS") == 0) { - myConverter->sharedData->conversionType = MBCS; + myConverter->sharedData->conversionType = UCNV_MBCS; } else if (icu_strcmp(value, "EBCDIC_STATEFUL") == 0) { - myConverter->sharedData->conversionType = EBCDIC_STATEFUL; + myConverter->sharedData->conversionType = UCNV_EBCDIC_STATEFUL; } else { @@ -393,9 +394,9 @@ void readHeaderFromFile(UConverter* myConverter, void loadSBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UErrorCode* err) { - char storageLine[MAX_LINE_TEXT]; + char storageLine[UCNV_MAX_LINE_TEXT]; char* line = NULL; - ConverterTable* myConverterTable = NULL; + UConverterTable* myUConverterTable = NULL; UChar unicodeValue = 0xFFFF; int32_t sbcsCodepageValue = 0; char codepointBytes[5]; @@ -404,10 +405,10 @@ void loadSBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError CompactByteArray* myFromUnicode = NULL; - if (FAILURE(*err)) return; + if (U_FAILURE(*err)) return; replacementChar = myConverter->subChar[0]; - myConverterTable = (ConverterTable*)icu_malloc(sizeof(SBCS_TABLE)); - if (myConverterTable == NULL) + myUConverterTable = (UConverterTable*)icu_malloc(sizeof(UConverterSBCSTable)); + if (myUConverterTable == NULL) { *err = U_MEMORY_ALLOCATION_ERROR; return; @@ -417,16 +418,16 @@ void loadSBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError myFromUnicode = ucmp8_open(0); if (myFromUnicode == NULL) { - icu_free(myConverterTable); + icu_free(myUConverterTable); *err = U_MEMORY_ALLOCATION_ERROR; return; } /*fills in the toUnicode array with the Unicode Replacement Char*/ - for (i=0;i<255;i++) myConverterTable->sbcs.toUnicode[i] = unicodeValue; + for (i=0;i<255;i++) myUConverterTable->sbcs.toUnicode[i] = unicodeValue; - while (T_FileStream_readLine(convFile, storageLine, MAX_LINE_TEXT)) + while (T_FileStream_readLine(convFile, storageLine, UCNV_MAX_LINE_TEXT)) { /*removes comments*/ removeComments(storageLine); @@ -443,25 +444,25 @@ void loadSBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError line = getToken(codepointBytes, line, CODEPOINT_SEPARATORS); sbcsCodepageValue = T_CString_stringToInteger(codepointBytes, 16); /*Store in the toUnicode array*/ - myConverterTable->sbcs.toUnicode[sbcsCodepageValue] = unicodeValue; + myUConverterTable->sbcs.toUnicode[sbcsCodepageValue] = unicodeValue; /*Store in the fromUnicode compact array*/ ucmp8_set(myFromUnicode, unicodeValue, (int8_t)sbcsCodepageValue); } } ucmp8_compact(myFromUnicode, 1); - myConverterTable->sbcs.fromUnicode = myFromUnicode; + myUConverterTable->sbcs.fromUnicode = myFromUnicode; /*Initially sets the referenceCounter to 1*/ myConverter->sharedData->referenceCounter = 1; - myConverter->sharedData->table = myConverterTable; + myConverter->sharedData->table = myUConverterTable; return; } void loadMBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UErrorCode* err) { - char storageLine[MAX_LINE_TEXT]; + char storageLine[UCNV_MAX_LINE_TEXT]; char* line = NULL; - ConverterTable* myConverterTable = NULL; + UConverterTable* myUConverterTable = NULL; UChar unicodeValue = 0xFFFF; int32_t mbcsCodepageValue = '\0'; char codepointBytes[6]; @@ -473,8 +474,8 @@ void loadMBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError /*Evaluates the replacement codepoint*/ replacementChar = 0xFFFF; - myConverterTable = (ConverterTable*)icu_malloc(sizeof(MBCS_TABLE)); - if (myConverterTable == NULL) + myUConverterTable = (UConverterTable*)icu_malloc(sizeof(UConverterMBCSTable)); + if (myUConverterTable == NULL) { *err = U_MEMORY_ALLOCATION_ERROR; return; @@ -484,13 +485,13 @@ void loadMBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError for (i=0; i<=255; i++) { - myConverterTable->mbcs.starters[i] = FALSE; + myUConverterTable->mbcs.starters[i] = FALSE; } myFromUnicode = ucmp16_open((uint16_t)replacementChar); myToUnicode = ucmp16_open((int16_t)0xFFFD); - while (T_FileStream_readLine(convFile, storageLine, MAX_LINE_TEXT)) + while (T_FileStream_readLine(convFile, storageLine, UCNV_MAX_LINE_TEXT)) { removeComments(storageLine); line = storageLine; @@ -503,7 +504,7 @@ void loadMBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError if (line[nextTokenOffset(line, CODEPOINT_SEPARATORS)] != '\0') { /*When there is a second byte*/ - myConverterTable->mbcs.starters[T_CString_stringToInteger(codepointBytes, 16)] = TRUE; + myUConverterTable->mbcs.starters[T_CString_stringToInteger(codepointBytes, 16)] = TRUE; line = getToken(codepointBytes+2, line, CODEPOINT_SEPARATORS); } @@ -516,10 +517,10 @@ void loadMBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError ucmp16_compact(myFromUnicode); ucmp16_compact(myToUnicode); - myConverterTable->mbcs.fromUnicode = myFromUnicode; - myConverterTable->mbcs.toUnicode = myToUnicode; + myUConverterTable->mbcs.fromUnicode = myFromUnicode; + myUConverterTable->mbcs.toUnicode = myToUnicode; myConverter->sharedData->referenceCounter = 1; - myConverter->sharedData->table = myConverterTable; + myConverter->sharedData->table = myUConverterTable; /* if the default subCharLen is > 1 we need to insert it in the data structure so that we know how to transition */ @@ -532,9 +533,9 @@ void loadMBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError void loadEBCDIC_STATEFULTableFromFile(FileStream* convFile, UConverter* myConverter, UErrorCode* err) { - char storageLine[MAX_LINE_TEXT]; + char storageLine[UCNV_MAX_LINE_TEXT]; char* line = NULL; - ConverterTable* myConverterTable = NULL; + UConverterTable* myUConverterTable = NULL; UChar unicodeValue = 0xFFFF; int32_t mbcsCodepageValue = '\0'; char codepointBytes[6]; @@ -546,8 +547,8 @@ void loadEBCDIC_STATEFULTableFromFile(FileStream* convFile, UConverter* myConver /*Evaluates the replacement codepoint*/ replacementChar = 0xFFFF; - myConverterTable = (ConverterTable*)icu_malloc(sizeof(MBCS_TABLE)); - if (myConverterTable == NULL) + myUConverterTable = (UConverterTable*)icu_malloc(sizeof(UConverterMBCSTable)); + if (myUConverterTable == NULL) { *err = U_MEMORY_ALLOCATION_ERROR; return; @@ -557,7 +558,7 @@ void loadEBCDIC_STATEFULTableFromFile(FileStream* convFile, UConverter* myConver myFromUnicode = ucmp16_open((uint16_t)replacementChar); myToUnicode = ucmp16_open((int16_t)0xFFFD); - while (T_FileStream_readLine(convFile, storageLine, MAX_LINE_TEXT)) + while (T_FileStream_readLine(convFile, storageLine, UCNV_MAX_LINE_TEXT)) { removeComments(storageLine); line = storageLine; @@ -582,10 +583,10 @@ void loadEBCDIC_STATEFULTableFromFile(FileStream* convFile, UConverter* myConver ucmp16_compact(myFromUnicode); ucmp16_compact(myToUnicode); - myConverterTable->dbcs.fromUnicode = myFromUnicode; - myConverterTable->dbcs.toUnicode = myToUnicode; + myUConverterTable->dbcs.fromUnicode = myFromUnicode; + myUConverterTable->dbcs.toUnicode = myToUnicode; myConverter->sharedData->referenceCounter = 1; - myConverter->sharedData->table = myConverterTable; + myConverter->sharedData->table = myUConverterTable; /* if the default subCharLen is > 1 we need to insert it in the data structure so that we know how to transition */ @@ -599,9 +600,9 @@ void loadEBCDIC_STATEFULTableFromFile(FileStream* convFile, UConverter* myConver void loadDBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UErrorCode* err) { - char storageLine[MAX_LINE_TEXT]; + char storageLine[UCNV_MAX_LINE_TEXT]; char* line = NULL; - ConverterTable* myConverterTable = NULL; + UConverterTable* myUConverterTable = NULL; UChar unicodeValue = 0xFFFD; int32_t dbcsCodepageValue = '\0'; char codepointBytes[6]; @@ -613,8 +614,8 @@ void loadDBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError /*Evaluates the replacement codepoint*/ replacementChar = 0xFFFF; - myConverterTable = (ConverterTable*)icu_malloc(sizeof(DBCS_TABLE)); - if (myConverterTable == NULL) + myUConverterTable = (UConverterTable*)icu_malloc(sizeof(UConverterDBCSTable)); + if (myUConverterTable == NULL) { *err = U_MEMORY_ALLOCATION_ERROR; return; @@ -623,7 +624,7 @@ void loadDBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError myFromUnicode = ucmp16_open((int16_t)replacementChar); myToUnicode = ucmp16_open((int16_t)0xFFFD); - while (T_FileStream_readLine(convFile, storageLine, MAX_LINE_TEXT)) + while (T_FileStream_readLine(convFile, storageLine, UCNV_MAX_LINE_TEXT)) { removeComments(storageLine); line = storageLine; @@ -647,10 +648,10 @@ void loadDBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError ucmp16_compact(myFromUnicode); ucmp16_compact(myToUnicode); - myConverterTable->dbcs.fromUnicode = myFromUnicode; - myConverterTable->dbcs.toUnicode = myToUnicode; + myUConverterTable->dbcs.fromUnicode = myFromUnicode; + myUConverterTable->dbcs.toUnicode = myToUnicode; myConverter->sharedData->referenceCounter = 1; - myConverter->sharedData->table = myConverterTable; + myConverter->sharedData->table = myUConverterTable; return; } @@ -658,20 +659,20 @@ void loadDBCSTableFromFile(FileStream* convFile, UConverter* myConverter, UError /*deletes the "shared" type object*/ bool_t deleteSharedConverterData(UConverterSharedData* deadSharedData) { - if (deadSharedData->conversionType == SBCS) + if (deadSharedData->conversionType == UCNV_SBCS) { ucmp8_close(deadSharedData->table->sbcs.fromUnicode); icu_free(deadSharedData->table); icu_free(deadSharedData); } - else if (deadSharedData->conversionType == MBCS) + else if (deadSharedData->conversionType == UCNV_MBCS) { ucmp16_close(deadSharedData->table->mbcs.fromUnicode); ucmp16_close(deadSharedData->table->mbcs.toUnicode); icu_free(deadSharedData->table); icu_free(deadSharedData); } - else if ((deadSharedData->conversionType == DBCS) || (deadSharedData->conversionType == EBCDIC_STATEFUL)) + else if ((deadSharedData->conversionType == UCNV_DBCS) || (deadSharedData->conversionType == UCNV_EBCDIC_STATEFUL)) { ucmp16_close(deadSharedData->table->dbcs.fromUnicode); ucmp16_close(deadSharedData->table->dbcs.toUnicode); @@ -696,7 +697,7 @@ UConverterSharedData* createConverterFromTableFile(const char* converterName, UE UConverter myConverter; - if (FAILURE(*err)) return NULL; + if (U_FAILURE(*err)) return NULL; convFile = T_FileStream_open(converterName, "r"); if (convFile == NULL) @@ -716,26 +717,26 @@ UConverterSharedData* createConverterFromTableFile(const char* converterName, UE myConverter.sharedData = mySharedData; readHeaderFromFile(&myConverter, convFile, err); - if (FAILURE(*err)) return NULL; + if (U_FAILURE(*err)) return NULL; switch (mySharedData->conversionType) { - case SBCS: + case UCNV_SBCS: { loadSBCSTableFromFile(convFile, &myConverter, err); break; } - case MBCS: + case UCNV_MBCS: { loadMBCSTableFromFile(convFile, &myConverter, err); break; } - case EBCDIC_STATEFUL: + case UCNV_EBCDIC_STATEFUL: { loadEBCDIC_STATEFULTableFromFile(convFile, &myConverter, err); break; } - case DBCS: + case UCNV_DBCS: { loadDBCSTableFromFile(convFile, &myConverter, err); break; diff --git a/icu4c/source/tools/rbdump/parse.c b/icu4c/source/tools/rbdump/parse.c index 396f5492e72..f7e60fa821c 100644 --- a/icu4c/source/tools/rbdump/parse.c +++ b/icu4c/source/tools/rbdump/parse.c @@ -53,7 +53,7 @@ read_ustring(FileStream *rb, int32_t len; UChar *s; - if(FAILURE(*status)) return 0; + if(U_FAILURE(*status)) return 0; /* Read the string's length */ T_FileStream_read(rb, &len, sizeof(len)); @@ -83,7 +83,7 @@ read_strlist(FileStream *rb, UChar *name; UChar *s; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* Read the name of this string list */ name = read_ustring(rb, status); @@ -100,7 +100,7 @@ read_strlist(FileStream *rb, s = read_ustring(rb, status); /* handle error */ - if(FAILURE(*status) || s == 0) { + if(U_FAILURE(*status) || s == 0) { goto finish; } @@ -126,7 +126,7 @@ read_strlist2d(FileStream *rb, UChar *name; UChar *s; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* Read the name of this 2-d string list */ name = read_ustring(rb, status); @@ -151,7 +151,7 @@ read_strlist2d(FileStream *rb, s = read_ustring(rb, status); /* handle error */ - if(FAILURE(*status) || s == 0) { + if(U_FAILURE(*status) || s == 0) { goto finish; } @@ -180,7 +180,7 @@ read_taglist(FileStream *rb, UChar *name; UChar *tag, *value; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* Read the name of this tagged list */ name = read_ustring(rb, status); @@ -198,7 +198,7 @@ read_taglist(FileStream *rb, value = read_ustring(rb, status); /* handle error */ - if(FAILURE(*status) || tag == 0 || value == 0) { + if(U_FAILURE(*status) || tag == 0 || value == 0) { goto finish; } @@ -227,7 +227,7 @@ parse(FileStream *f, int32_t itemtype; UChar *localename; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* Read the byte order mark from the file */ T_FileStream_read(f, &bom, sizeof(bom)); @@ -244,7 +244,7 @@ parse(FileStream *f, uprint(localename, stdout, status); fputc('\n', stdout); - if(FAILURE(*status)) { + if(U_FAILURE(*status)) { goto finish; } @@ -263,21 +263,21 @@ parse(FileStream *f, switch(itemtype) { case STRINGLIST: read_strlist(f, status); - if(FAILURE(*status)) { + if(U_FAILURE(*status)) { goto finish; } break; case STRINGLIST2D: read_strlist2d(f, status); - if(FAILURE(*status)) { + if(U_FAILURE(*status)) { goto finish; } break; case TAGGEDLIST: read_taglist(f, status); - if(FAILURE(*status)) { + if(U_FAILURE(*status)) { goto finish; } break; diff --git a/icu4c/source/tools/rbdump/read.c b/icu4c/source/tools/rbdump/read.c index 94fe8f17d4e..ce2d7e80ded 100644 --- a/icu4c/source/tools/rbdump/read.c +++ b/icu4c/source/tools/rbdump/read.c @@ -94,7 +94,7 @@ main(int argc, for(i = optind; i < argc; ++i) { status = U_ZERO_ERROR; processFile(argv[i], &status); - if(FAILURE(status)) { + if(U_FAILURE(status)) { printf("rbdump: %s processing file \"%s\"\n", errorName(status), argv[i]); } } @@ -131,7 +131,7 @@ processFile(const char *filename, { FileStream *in; - if(FAILURE(*status)) return; + if(U_FAILURE(*status)) return; /* Setup */ in = 0; diff --git a/icu4c/source/tools/rbdump/uprint.c b/icu4c/source/tools/rbdump/uprint.c index 57ada0489fb..d336eb8ac5a 100644 --- a/icu4c/source/tools/rbdump/uprint.c +++ b/icu4c/source/tools/rbdump/uprint.c @@ -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 { diff --git a/icu4c/source/tools/ulxfrm/ucmp16.h b/icu4c/source/tools/ulxfrm/ucmp16.h index 598c1b36222..4adfa2f1e6b 100644 --- a/icu4c/source/tools/ulxfrm/ucmp16.h +++ b/icu4c/source/tools/ulxfrm/ucmp16.h @@ -76,7 +76,7 @@ * @see CompactIntArray * @see CompactCharArray * @see CompactStringArray - * @version $Revision: 1.2 $ 8/25/98 + * @version $Revision: 1.3 $ 8/25/98 * @author Helena Shih */ @@ -94,23 +94,23 @@ typedef struct } CompactShortArray; -CAPI const int32_t UCMP16_kMaxUnicode; -CAPI const int32_t UCMP16_kUnicodeCount; -CAPI const int32_t UCMP16_kBlockShift; -CAPI const int32_t UCMP16_kBlockCount; -CAPI const int32_t UCMP16_kBlockBytes; -CAPI const int32_t UCMP16_kIndexShift; -CAPI const int32_t UCMP16_kIndexCount; -CAPI const uint32_t UCMP16_kBlockMask; +U_CAPI const int32_t UCMP16_kMaxUnicode; +U_CAPI const int32_t UCMP16_kUnicodeCount; +U_CAPI const int32_t UCMP16_kBlockShift; +U_CAPI const int32_t UCMP16_kBlockCount; +U_CAPI const int32_t UCMP16_kBlockBytes; +U_CAPI const int32_t UCMP16_kIndexShift; +U_CAPI const int32_t UCMP16_kIndexCount; +U_CAPI const uint32_t UCMP16_kBlockMask; -CAPI int32_t ucmp16_getkUnicodeCount(void); -CAPI int32_t ucmp16_getkBlockCount(void); -CAPI int32_t ucmp16_getkIndexCount(void); +U_CAPI int32_t ucmp16_getkUnicodeCount(void); +U_CAPI int32_t ucmp16_getkBlockCount(void); +U_CAPI int32_t ucmp16_getkIndexCount(void); /** * Construct an empty CompactShortArray. * @param defaultValue the default value for all characters not explicitly in the array */ -CAPI CompactShortArray* ucmp16_open(int16_t defaultValue); +U_CAPI CompactShortArray* ucmp16_open(int16_t defaultValue); /** * Construct a CompactShortArray from a pre-computed index and values array. The values @@ -124,24 +124,24 @@ CAPI CompactShortArray* ucmp16_open(int16_t defaultValue); * @param defaultValue the default value for all characters not explicitly in the array * @see compact */ -CAPI CompactShortArray* ucmp16_openAdopt(uint16_t *indexArray, +U_CAPI CompactShortArray* ucmp16_openAdopt(uint16_t *indexArray, int16_t *newValues, int32_t count, int16_t defaultValue ); -CAPI CompactShortArray* ucmp16_openAdoptWithBlockShift(uint16_t *indexArray, +U_CAPI CompactShortArray* ucmp16_openAdoptWithBlockShift(uint16_t *indexArray, int16_t *newValues, int32_t count, int16_t defaultValue, int32_t blockShift); -CAPI void ucmp16_close(CompactShortArray* array); +U_CAPI void ucmp16_close(CompactShortArray* array); /** * Returns TRUE if the creation of the compact array fails. */ -CAPI bool_t ucmp16_isBogus(const CompactShortArray* array); +U_CAPI bool_t ucmp16_isBogus(const CompactShortArray* array); /** * @@ -162,7 +162,7 @@ CAPI bool_t ucmp16_isBogus(const CompactShortArray* array); * @param index the character to set the mapped value with * @param value the new mapped value */ -CAPI void ucmp16_set(CompactShortArray *array, +U_CAPI void ucmp16_set(CompactShortArray *array, UChar index, int16_t value); @@ -174,7 +174,7 @@ CAPI void ucmp16_set(CompactShortArray *array, * @param end the ending offset of the range * @param value the new mapped value */ -CAPI void ucmp16_setRange(CompactShortArray* array, +U_CAPI void ucmp16_setRange(CompactShortArray* array, UChar start, UChar end, int16_t value); @@ -186,33 +186,33 @@ CAPI void 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 ucmp16_compact(CompactShortArray* array); +U_CAPI void ucmp16_compact(CompactShortArray* array); /** * Get the default value. */ -CAPI int16_t ucmp16_getDefaultValue(const CompactShortArray* array); +U_CAPI int16_t 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 ucmp16_getCount(const CompactShortArray* array); +U_CAPI uint32_t ucmp16_getCount(const CompactShortArray* array); /** * * Get the address of the value array. * @return the address of the value array */ -CAPI const int16_t* ucmp16_getArray(const CompactShortArray* array); +U_CAPI const int16_t* ucmp16_getArray(const CompactShortArray* array); /** * * Get the address of the index array. * @return the address of the index array */ -CAPI const uint16_t* ucmp16_getIndex(const CompactShortArray* array); +U_CAPI const uint16_t* ucmp16_getIndex(const CompactShortArray* array);