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

ICU-12012 Replace all sizeof p / sizeof *p with UPRV_LENGTHOF().

Browse source 
R=markus.icu@gmail.com

Review URL: https://codereview.appspot.com/285520043 .

X-SVN-Rev: 38337
This commit is contained in:
Fredrik Roubert 2016-02-23 10:40:09 +00:00
parent 2b457a4ea1
commit 7f4b8d106b
157 changed files with 1451 additions and 1468 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
icu4c/source/common/brkeng.cpp
View file

@ -1,6 +1,6 @@
/*
************************************************************************************
* Copyright (C) 2006-2015, International Business Machines Corporation
* Copyright (C) 2006-2016, International Business Machines Corporation
* and others. All Rights Reserved.
************************************************************************************
*/
@ -10,6 +10,7 @@
#if !UCONFIG_NO_BREAK_ITERATION
#include "brkeng.h"
#include "cmemory.h"
#include "dictbe.h"
#include "unicode/uchar.h"
#include "unicode/uniset.h"
@ -56,13 +57,13 @@ LanguageBreakFactory::~LanguageBreakFactory() {
*/
UnhandledEngine::UnhandledEngine(UErrorCode &/*status*/) {
for (int32_t i = 0; i < (int32_t)(sizeof(fHandled)/sizeof(fHandled[0])); ++i) {
for (int32_t i = 0; i < UPRV_LENGTHOF(fHandled); ++i) {
fHandled[i] = 0;
}
}
UnhandledEngine::~UnhandledEngine() {
for (int32_t i = 0; i < (int32_t)(sizeof(fHandled)/sizeof(fHandled[0])); ++i) {
for (int32_t i = 0; i < UPRV_LENGTHOF(fHandled); ++i) {
if (fHandled[i] != 0) {
delete fHandled[i];
}
@ -71,7 +72,7 @@ UnhandledEngine::~UnhandledEngine() {
UBool
UnhandledEngine::handles(UChar32 c, int32_t breakType) const {
return (breakType >= 0 && breakType < (int32_t)(sizeof(fHandled)/sizeof(fHandled[0]))
return (breakType >= 0 && breakType < UPRV_LENGTHOF(fHandled)
&& fHandled[breakType] != 0 && fHandled[breakType]->contains(c));
}
@ -82,7 +83,7 @@ UnhandledEngine::findBreaks( UText *text,
UBool reverse,
int32_t breakType,
UStack &/*foundBreaks*/ ) const {
if (breakType >= 0 && breakType < (int32_t)(sizeof(fHandled)/sizeof(fHandled[0]))) {
if (breakType >= 0 && breakType < UPRV_LENGTHOF(fHandled)) {
UChar32 c = utext_current32(text);
if (reverse) {
while((int32_t)utext_getNativeIndex(text) > startPos && fHandled[breakType]->contains(c)) {
@ -101,7 +102,7 @@ UnhandledEngine::findBreaks( UText *text,
void
UnhandledEngine::handleCharacter(UChar32 c, int32_t breakType) {
if (breakType >= 0 && breakType < (int32_t)(sizeof(fHandled)/sizeof(fHandled[0]))) {
if (breakType >= 0 && breakType < UPRV_LENGTHOF(fHandled)) {
if (fHandled[breakType] == 0) {
fHandled[breakType] = new UnicodeSet();
if (fHandled[breakType] == 0) {

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

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1997-2015, International Business Machines
* Copyright (C) 1997-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -536,7 +536,7 @@ Locale& Locale::init(const char* localeID, UBool canonicalize)
/* after uloc_getName/canonicalize() we know that only '_' are separators */
separator = field[0] = fullName;
fieldIdx = 1;
while ((separator = uprv_strchr(field[fieldIdx-1], SEP_CHAR)) && fieldIdx < (int32_t)(sizeof(field)/sizeof(field[0]))-1) {
while ((separator = uprv_strchr(field[fieldIdx-1], SEP_CHAR)) && fieldIdx < UPRV_LENGTHOF(field)-1) {
field[fieldIdx] = separator + 1;
fieldLen[fieldIdx-1] = (int32_t)(separator - field[fieldIdx-1]);
fieldIdx++;

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

@ -1022,7 +1022,7 @@ uprv_convertToPosix(uint32_t hostid, char *posixID, int32_t posixIDCapacity, UEr
int32_t tmpLen = 0;
char locName[157]; /* ULOC_FULLNAME_CAPACITY */
tmpLen = GetLocaleInfoA(hostid, LOCALE_SNAME, (LPSTR)locName, sizeof(locName)/sizeof(locName[0]));
tmpLen = GetLocaleInfoA(hostid, LOCALE_SNAME, (LPSTR)locName, UPRV_LENGTHOF(locName));
if (tmpLen > 1) {
/* Windows locale name may contain sorting variant, such as "es-ES_tradnl".
In such case, we need special mapping data found in the hardcoded table

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

@ -1,7 +1,7 @@
/*
********************************************************************
* COPYRIGHT:
* Copyright (c) 1996-2015, International Business Machines Corporation and
* Copyright (c) 1996-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************
*
@ -385,7 +385,7 @@ getAlgorithmicTypeFromName(const char *realName)
/* do a binary search for the alias */
start = 0;
limit = sizeof(cnvNameType)/sizeof(cnvNameType[0]);
limit = UPRV_LENGTHOF(cnvNameType);
mid = limit;
lastMid = UINT32_MAX;

5
icu4c/source/common/ucnv_u7.c
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2002-2015, International Business Machines
* Copyright (C) 2002-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: ucnv_u7.c
@ -18,6 +18,7 @@
#if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION
#include "cmemory.h"
#include "unicode/ucnv.h"
#include "ucnv_bld.h"
#include "ucnv_cnv.h"
@ -487,7 +488,7 @@ _UTF7FromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
inDirectMode=(UBool)((status>>24)&1);
base64Counter=(int8_t)(status>>16);
bits=(uint8_t)status;
U_ASSERT(bits<=sizeof(toBase64)/sizeof(toBase64[0]));
U_ASSERT(bits<=UPRV_LENGTHOF(toBase64));
}
/* UTF-7 always encodes UTF-16 code units, therefore we need only a simple sourceIndex */

4
icu4c/source/common/ucnvisci.c
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2000-2015, International Business Machines
* Copyright (C) 2000-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: ucnvisci.c
@ -1334,7 +1334,7 @@ static void UConverter_toUnicode_ISCII_OFFSETS_LOGIC(UConverterToUnicodeArgs *ar
i=1;
found=FALSE;
for (; i<vowelSignESpecialCases[0][0]; i++) {
U_ASSERT(i<sizeof(vowelSignESpecialCases)/sizeof(vowelSignESpecialCases[0]));
U_ASSERT(i<UPRV_LENGTHOF(vowelSignESpecialCases));
if (vowelSignESpecialCases[i][0]==(uint8_t)*contextCharToUnicode) {
targetUniChar=vowelSignESpecialCases[i][1];
found=TRUE;

6
icu4c/source/common/ucurr.cpp
View file

@ -56,7 +56,7 @@ static const int32_t LAST_RESORT_DATA[] = { 2, 0, 2, 0 };
static const int32_t POW10[] = { 1, 10, 100, 1000, 10000, 100000,
1000000, 10000000, 100000000, 1000000000 };
static const int32_t MAX_POW10 = (sizeof(POW10)/sizeof(POW10[0])) - 1;
static const int32_t MAX_POW10 = UPRV_LENGTHOF(POW10) - 1;
// Defines equivalent currency symbols.
static const char *EQUIV_CURRENCY_SYMBOLS[][2] = {
@ -1976,7 +1976,7 @@ ucurr_nextCurrencyList(UEnumeration *enumerator,
UCurrencyContext *myContext = (UCurrencyContext *)(enumerator->context);
/* Find the next in the list that matches the type we are looking for. */
while (myContext->listIdx < (sizeof(gCurrencyList)/sizeof(gCurrencyList[0]))-1) {
while (myContext->listIdx < UPRV_LENGTHOF(gCurrencyList)-1) {
const struct CurrencyList *currItem = &gCurrencyList[myContext->listIdx++];
if (UCURR_MATCHES_BITMASK(currItem->currType, myContext->currType))
{
@ -2120,7 +2120,7 @@ static void populateCurrSymbolsEquiv(icu::Hashtable *hash, UErrorCode &status) {
if (U_FAILURE(status)) {
return;
}
int32_t length = sizeof(EQUIV_CURRENCY_SYMBOLS) / sizeof(EQUIV_CURRENCY_SYMBOLS[0]);
int32_t length = UPRV_LENGTHOF(EQUIV_CURRENCY_SYMBOLS);
for (int32_t i = 0; i < length; ++i) {
icu::UnicodeString lhs(EQUIV_CURRENCY_SYMBOLS[i][0], -1, US_INV);
icu::UnicodeString rhs(EQUIV_CURRENCY_SYMBOLS[i][1], -1, US_INV);

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

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1997-2014, International Business Machines
* Copyright (C) 1997-2016, International Business Machines
* Corporation and others. All Rights Reserved.
******************************************************************************
* Date Name Description
@ -83,7 +83,7 @@ static const int32_t PRIMES[] = {
1073741789, 2147483647 /*, 4294967291 */
};
#define PRIMES_LENGTH (sizeof(PRIMES) / sizeof(PRIMES[0]))
#define PRIMES_LENGTH UPRV_LENGTHOF(PRIMES)
#define DEFAULT_PRIME_INDEX 3
/* These ratios are tuned to the PRIMES array such that a resize

20
icu4c/source/common/uloc.cpp
View file

@ -1664,7 +1664,7 @@ uloc_openKeywords(const char* localeID,
#define OPTION_SET(options, mask) ((options & mask) != 0)
static const char i_default[] = {'i', '-', 'd', 'e', 'f', 'a', 'u', 'l', 't'};
#define I_DEFAULT_LENGTH (sizeof i_default / sizeof i_default[0])
#define I_DEFAULT_LENGTH UPRV_LENGTHOF(i_default)
/**
* Canonicalize the given localeID, to level 1 or to level 2,
@ -1854,7 +1854,7 @@ _canonicalize(const char* localeID,
/* Handle generic variants first */
if (variant) {
for (j=0; j<(int32_t)(sizeof(VARIANT_MAP)/sizeof(VARIANT_MAP[0])); j++) {
for (j=0; j<UPRV_LENGTHOF(VARIANT_MAP); j++) {
const char* variantToCompare = VARIANT_MAP[j].variant;
int32_t n = (int32_t)uprv_strlen(variantToCompare);
int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
@ -1874,7 +1874,7 @@ _canonicalize(const char* localeID,
}
/* Look up the ID in the canonicalization map */
for (j=0; j<(int32_t)(sizeof(CANONICALIZE_MAP)/sizeof(CANONICALIZE_MAP[0])); j++) {
for (j=0; j<UPRV_LENGTHOF(CANONICALIZE_MAP); j++) {
const char* id = CANONICALIZE_MAP[j].id;
int32_t n = (int32_t)uprv_strlen(id);
if (len == n && uprv_strncmp(name, id, n) == 0) {
@ -2174,19 +2174,19 @@ uloc_getLCID(const char* localeID)
char tmpLocaleID[ULOC_FULLNAME_CAPACITY];
len = uloc_getKeywordValue(localeID, "collation", collVal,
sizeof(collVal)/sizeof(collVal[0]) - 1, &status);
UPRV_LENGTHOF(collVal) - 1, &status);
if (U_SUCCESS(status) && len > 0) {
collVal[len] = 0;
len = uloc_getBaseName(localeID, tmpLocaleID,
sizeof(tmpLocaleID)/sizeof(tmpLocaleID[0]) - 1, &status);
UPRV_LENGTHOF(tmpLocaleID) - 1, &status);
if (U_SUCCESS(status) && len > 0) {
tmpLocaleID[len] = 0;
len = uloc_setKeywordValue("collation", collVal, tmpLocaleID,
sizeof(tmpLocaleID)/sizeof(tmpLocaleID[0]) - len - 1, &status);
UPRV_LENGTHOF(tmpLocaleID) - len - 1, &status);
if (U_SUCCESS(status) && len > 0) {
tmpLocaleID[len] = 0;
@ -2354,7 +2354,7 @@ uloc_acceptLanguageFromHTTP(char *result, int32_t resultAvailable, UAcceptResult
char *tempstr; /* Use for null pointer check */
j = smallBuffer;
jSize = sizeof(smallBuffer)/sizeof(smallBuffer[0]);
jSize = UPRV_LENGTHOF(smallBuffer);
if(U_FAILURE(*status)) {
return -1;
}
@ -2399,7 +2399,7 @@ uloc_acceptLanguageFromHTTP(char *result, int32_t resultAvailable, UAcceptResult
return -1;
}
j[n].locale = tempstr;
uloc_canonicalize(j[n].locale,tmp,sizeof(tmp)/sizeof(tmp[0]),status);
uloc_canonicalize(j[n].locale,tmp,UPRV_LENGTHOF(tmp),status);
if(strcmp(j[n].locale,tmp)) {
uprv_free(j[n].locale);
j[n].locale=uprv_strdup(tmp);
@ -2525,7 +2525,7 @@ uloc_acceptLanguage(char *result, int32_t resultAvailable,
}
uenum_reset(availableLocales, status);
/* save off parent info */
if(uloc_getParent(acceptList[i], tmp, sizeof(tmp)/sizeof(tmp[0]), status)!=0) {
if(uloc_getParent(acceptList[i], tmp, UPRV_LENGTHOF(tmp), status)!=0) {
fallbackList[i] = uprv_strdup(tmp);
} else {
fallbackList[i]=0;
@ -2562,7 +2562,7 @@ uloc_acceptLanguage(char *result, int32_t resultAvailable,
}
uenum_reset(availableLocales, status);
if(uloc_getParent(fallbackList[i], tmp, sizeof(tmp)/sizeof(tmp[0]), status)!=0) {
if(uloc_getParent(fallbackList[i], tmp, UPRV_LENGTHOF(tmp), status)!=0) {
uprv_free(fallbackList[i]);
fallbackList[i] = uprv_strdup(tmp);
} else {

6
icu4c/source/common/usc_impl.c
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2014, International Business Machines
* Copyright (C) 1999-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -17,8 +17,6 @@
#include "usc_impl.h"
#include "cmemory.h"
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#define PAREN_STACK_DEPTH 32
#define MOD(sp) ((sp) % PAREN_STACK_DEPTH)
@ -156,7 +154,7 @@ highBit(int32_t value)
static int32_t
getPairIndex(UChar32 ch)
{
int32_t pairedCharCount = ARRAY_SIZE(pairedChars);
int32_t pairedCharCount = UPRV_LENGTHOF(pairedChars);
int32_t pairedCharPower = 1 << highBit(pairedCharCount);
int32_t pairedCharExtra = pairedCharCount - pairedCharPower;

6
icu4c/source/common/ushape.cpp
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2000-2014, International Business Machines
* Copyright (C) 2000-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -928,7 +928,7 @@ expandCompositCharAtBegin(UChar *dest, int32_t sourceLength, int32_t destSize,UE
tempbuffer[j] = LAM_CHAR;
/* to ensure the array index is within the range */
U_ASSERT(dest[i] >= 0xFEF5u
&& dest[i]-0xFEF5u < sizeof(convertLamAlef)/sizeof(convertLamAlef[0]));
&& dest[i]-0xFEF5u < UPRV_LENGTHOF(convertLamAlef));
tempbuffer[j-1] = convertLamAlef[ dest[i] - 0xFEF5 ];
j--;
countl--;
@ -1322,7 +1322,7 @@ shapeUnicode(UChar *dest, int32_t sourceLength,
} else {
/* to ensure the array index is within the range */
U_ASSERT(dest[i] >= 0x064Bu
&& dest[i]-0x064Bu < sizeof(IrrelevantPos)/sizeof(IrrelevantPos[0]));
&& dest[i]-0x064Bu < UPRV_LENGTHOF(IrrelevantPos));
dest[i] = 0xFE70 + IrrelevantPos[(dest[i] - 0x064B)] + Shape;
}
}else if ((currLink & APRESENT) > 0) {

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

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2014, International Business Machines
* Copyright (C) 2003-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -409,7 +409,7 @@ usprep_openByType(UStringPrepProfileType type,
return NULL;
}
int32_t index = (int32_t)type;
if (index < 0 || index >= (int32_t)(sizeof(PROFILE_NAMES)/sizeof(PROFILE_NAMES[0]))) {
if (index < 0 || index >= UPRV_LENGTHOF(PROFILE_NAMES)) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return NULL;
}

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

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1998-2014, International Business Machines
* Copyright (C) 1998-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -1179,7 +1179,7 @@ static const UChar UNESCAPE_MAP[] = {
/*t*/ 0x74, 0x09,
/*v*/ 0x76, 0x0b
};
enum { UNESCAPE_MAP_LENGTH = sizeof(UNESCAPE_MAP) / sizeof(UNESCAPE_MAP[0]) };
enum { UNESCAPE_MAP_LENGTH = UPRV_LENGTHOF(UNESCAPE_MAP) };
/* Convert one octal digit to a numeric value 0..7, or -1 on failure */
static int8_t _digit8(UChar c) {

7
icu4c/source/extra/scrptrun/scrptrun.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1999-2001, International Business Machines
* Copyright (C) 1999-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -14,10 +14,9 @@
#include "unicode/utypes.h"
#include "unicode/uscript.h"
#include "cmemory.h"
#include "scrptrun.h"
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
const char ScriptRun::fgClassID=0;
UChar32 ScriptRun::pairedChars[] = {
@ -40,7 +39,7 @@ UChar32 ScriptRun::pairedChars[] = {
0x301a, 0x301b
};
const int32_t ScriptRun::pairedCharCount = ARRAY_SIZE(pairedChars);
const int32_t ScriptRun::pairedCharCount = UPRV_LENGTHOF(pairedChars);
const int32_t ScriptRun::pairedCharPower = 1 << highBit(pairedCharCount);
const int32_t ScriptRun::pairedCharExtra = pairedCharCount - pairedCharPower;

7
icu4c/source/extra/scrptrun/srtest.cpp
View file

@ -1,13 +1,14 @@
/*
* %W% %E%
*
* (C) Copyright IBM Corp. 2001 - All Rights Reserved
* (C) Copyright IBM Corp. 2001-2016 - All Rights Reserved
*
*/
#include "unicode/utypes.h"
#include "unicode/uscript.h"
#include "cmemory.h"
#include "scrptrun.h"
#include <stdio.h>
@ -22,7 +23,7 @@ UChar testChars[] = {
0xD801, 0xDC00, 0xD801, 0xDC01, 0xD801, 0xDC02, 0xD801, 0xDC03
};
int32_t testLength = sizeof testChars / sizeof testChars[0];
int32_t testLength = UPRV_LENGTHOF(testChars);
void main()
{
@ -35,4 +36,4 @@ void main()
printf("Script '%s' from %d to %d.\n", uscript_getName(code), start, end);
}
}
}

8
icu4c/source/extra/uconv/uconv.cpp
View file

@ -1,6 +1,6 @@
/*****************************************************************************
*
* Copyright (C) 1999-2014, International Business Machines
* Copyright (C) 1999-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************/
@ -173,7 +173,7 @@ static struct callback_ent {
static const struct callback_ent *findCallback(const char *name) {
int i, count =
sizeof(transcode_callbacks) / sizeof(*transcode_callbacks);
UPRV_LENGTHOF(transcode_callbacks);
/* We'll do a linear search, there aren't many of them and bsearch()
may not be that portable. */
@ -944,7 +944,7 @@ ConvertFile::convertFile(const char *pname,
int8_t i, length, errorLength;
UErrorCode localError = U_ZERO_ERROR;
errorLength = (int8_t)UPRV_LENGTHOF(errorUChars);
errorLength = UPRV_LENGTHOF(errorUChars);
ucnv_getInvalidUChars(convto, errorUChars, &errorLength, &localError);
if (U_FAILURE(localError) || errorLength == 0) {
// need at least 1 so that we don't access beyond the length of fromoffsets[]
@ -1082,7 +1082,7 @@ static void usage(const char *pname, int ecode) {
/* Now dump callbacks and finish. */
int i, count =
sizeof(transcode_callbacks) / sizeof(*transcode_callbacks);
UPRV_LENGTHOF(transcode_callbacks);
for (i = 0; i < count; ++i) {
fprintf(fp, " %s", transcode_callbacks[i].name);
}

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

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2015, International Business Machines
* Copyright (C) 2005-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -27,8 +27,6 @@
#include "csrucode.h"
#include "csr2022.h"
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#define NEW_ARRAY(type,count) (type *) uprv_malloc((count) * sizeof(type))
#define DELETE_ARRAY(array) uprv_free((void *) (array))
@ -120,7 +118,7 @@ static void U_CALLCONV initRecognizers(UErrorCode &status) {
new CSRecognizerInfo(new CharsetRecog_IBM420_ar_ltr(), FALSE)
#endif
};
int32_t rCount = ARRAY_SIZE(tempArray);
int32_t rCount = UPRV_LENGTHOF(tempArray);
fCSRecognizers = NEW_ARRAY(CSRecognizerInfo *, rCount);

11
icu4c/source/i18n/csr2022.cpp
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2015, International Business Machines
* Copyright (C) 2005-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -9,6 +9,7 @@
#if !UCONFIG_NO_CONVERSION
#include "cmemory.h"
#include "cstring.h"
#include "csr2022.h"
@ -16,8 +17,6 @@
U_NAMESPACE_BEGIN
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
/**
* Matching function shared among the 2022 detectors JP, CN and KR
* Counts up the number of legal and unrecognized escape sequences in
@ -149,7 +148,7 @@ UBool CharsetRecog_2022JP::match(InputText *textIn, CharsetMatch *results) const
int32_t confidence = match_2022(textIn->fInputBytes,
textIn->fInputLen,
escapeSequences_2022JP,
ARRAY_SIZE(escapeSequences_2022JP));
UPRV_LENGTHOF(escapeSequences_2022JP));
results->set(textIn, this, confidence);
return (confidence > 0);
}
@ -165,7 +164,7 @@ UBool CharsetRecog_2022KR::match(InputText *textIn, CharsetMatch *results) const
int32_t confidence = match_2022(textIn->fInputBytes,
textIn->fInputLen,
escapeSequences_2022KR,
ARRAY_SIZE(escapeSequences_2022KR));
UPRV_LENGTHOF(escapeSequences_2022KR));
results->set(textIn, this, confidence);
return (confidence > 0);
}
@ -180,7 +179,7 @@ UBool CharsetRecog_2022CN::match(InputText *textIn, CharsetMatch *results) const
int32_t confidence = match_2022(textIn->fInputBytes,
textIn->fInputLen,
escapeSequences_2022CN,
ARRAY_SIZE(escapeSequences_2022CN));
UPRV_LENGTHOF(escapeSequences_2022CN));
results->set(textIn, this, confidence);
return (confidence > 0);
}

15
icu4c/source/i18n/csrmbcs.cpp
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2012, International Business Machines
* Copyright (C) 2005-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -9,6 +9,7 @@
#if !UCONFIG_NO_CONVERSION
#include "cmemory.h"
#include "csmatch.h"
#include "csrmbcs.h"
@ -16,8 +17,6 @@
U_NAMESPACE_BEGIN
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#define min(x,y) (((x)<(y))?(x):(y))
static const uint16_t commonChars_sjis [] = {
@ -269,7 +268,7 @@ UBool CharsetRecog_sjis::nextChar(IteratedChar* it, InputText* det) const {
}
UBool CharsetRecog_sjis::match(InputText* det, CharsetMatch *results) const {
int32_t confidence = match_mbcs(det, commonChars_sjis, ARRAY_SIZE(commonChars_sjis));
int32_t confidence = match_mbcs(det, commonChars_sjis, UPRV_LENGTHOF(commonChars_sjis));
results->set(det, this, confidence);
return (confidence > 0);
}
@ -370,7 +369,7 @@ const char *CharsetRecog_euc_jp::getLanguage() const
UBool CharsetRecog_euc_jp::match(InputText *det, CharsetMatch *results) const
{
int32_t confidence = match_mbcs(det, commonChars_euc_jp, ARRAY_SIZE(commonChars_euc_jp));
int32_t confidence = match_mbcs(det, commonChars_euc_jp, UPRV_LENGTHOF(commonChars_euc_jp));
results->set(det, this, confidence);
return (confidence > 0);
}
@ -392,7 +391,7 @@ const char *CharsetRecog_euc_kr::getLanguage() const
UBool CharsetRecog_euc_kr::match(InputText *det, CharsetMatch *results) const
{
int32_t confidence = match_mbcs(det, commonChars_euc_kr, ARRAY_SIZE(commonChars_euc_kr));
int32_t confidence = match_mbcs(det, commonChars_euc_kr, UPRV_LENGTHOF(commonChars_euc_kr));
results->set(det, this, confidence);
return (confidence > 0);
}
@ -444,7 +443,7 @@ const char *CharsetRecog_big5::getLanguage() const
UBool CharsetRecog_big5::match(InputText *det, CharsetMatch *results) const
{
int32_t confidence = match_mbcs(det, commonChars_big5, ARRAY_SIZE(commonChars_big5));
int32_t confidence = match_mbcs(det, commonChars_big5, UPRV_LENGTHOF(commonChars_big5));
results->set(det, this, confidence);
return (confidence > 0);
}
@ -520,7 +519,7 @@ const char *CharsetRecog_gb_18030::getLanguage() const
UBool CharsetRecog_gb_18030::match(InputText *det, CharsetMatch *results) const
{
int32_t confidence = match_mbcs(det, commonChars_gb_18030, ARRAY_SIZE(commonChars_gb_18030));
int32_t confidence = match_mbcs(det, commonChars_gb_18030, UPRV_LENGTHOF(commonChars_gb_18030));
results->set(det, this, confidence);
return (confidence > 0);
}

7
icu4c/source/i18n/csrsbcs.cpp
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2015, International Business Machines
* Copyright (C) 2005-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -15,7 +15,6 @@
#define N_GRAM_SIZE 3
#define N_GRAM_MASK 0xFFFFFF
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
U_NAMESPACE_BEGIN
@ -892,7 +891,7 @@ UBool CharsetRecog_8859_1::match(InputText *textIn, CharsetMatch *results) const
const char *name = textIn->fC1Bytes? "windows-1252" : "ISO-8859-1";
uint32_t i;
int32_t bestConfidenceSoFar = -1;
for (i=0; i < ARRAY_SIZE(ngrams_8859_1) ; i++) {
for (i=0; i < UPRV_LENGTHOF(ngrams_8859_1) ; i++) {
const int32_t *ngrams = ngrams_8859_1[i].ngrams;
const char *lang = ngrams_8859_1[i].lang;
int32_t confidence = match_sbcs(textIn, ngrams, charMap_8859_1);
@ -919,7 +918,7 @@ UBool CharsetRecog_8859_2::match(InputText *textIn, CharsetMatch *results) const
const char *name = textIn->fC1Bytes? "windows-1250" : "ISO-8859-2";
uint32_t i;
int32_t bestConfidenceSoFar = -1;
for (i=0; i < ARRAY_SIZE(ngrams_8859_2) ; i++) {
for (i=0; i < UPRV_LENGTHOF(ngrams_8859_2) ; i++) {
const int32_t *ngrams = ngrams_8859_2[i].ngrams;
const char *lang = ngrams_8859_2[i].lang;
int32_t confidence = match_sbcs(textIn, ngrams, charMap_8859_2);

8
icu4c/source/i18n/decfmtst.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 2009-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
* Copyright (C) 2009-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
* This file contains the class DecimalFormatStaticSets
@ -141,11 +141,11 @@ DecimalFormatStaticSets::DecimalFormatStaticSets(UErrorCode &status)
initUnicodeSet(
gMinusSigns,
sizeof(gMinusSigns) / sizeof(gMinusSigns[0]),
UPRV_LENGTHOF(gMinusSigns),
fMinusSigns);
initUnicodeSet(
gPlusSigns,
sizeof(gPlusSigns) / sizeof(gPlusSigns[0]),
UPRV_LENGTHOF(gPlusSigns),
fPlusSigns);
// Freeze all the sets

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

@ -1,7 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 1997-2015, International Business Machines Corporation and *
* others. All Rights Reserved. *
* Copyright (C) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
* File DTFMTSYM.CPP
@ -77,9 +77,6 @@ static const UChar gPatternChars[] = {
#endif
};
/* length of an array */
#define ARRAY_LENGTH(array) (sizeof(array)/sizeof(array[0]))
//------------------------------------------------------
// Strings of last resort. These are only used if we have no resource
// files. They aren't designed for actual use, just for backup.

5
icu4c/source/i18n/dtitvfmt.cpp
View file

@ -21,6 +21,7 @@
#include "unicode/dtptngen.h"
#include "unicode/dtitvinf.h"
#include "unicode/simpleformatter.h"
#include "cmemory.h"
#include "cstring.h"
#include "dtitv_impl.h"
#include "gregoimp.h"
@ -1099,8 +1100,8 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field,
const UnicodeString* pattern = &intervalPattern;
UBool order = laterDateFirst;
// check for "latestFirst:" or "earliestFirst:" prefix
int8_t prefixLength = sizeof(gLaterFirstPrefix)/sizeof(gLaterFirstPrefix[0]);
int8_t earliestFirstLength = sizeof(gEarlierFirstPrefix)/sizeof(gEarlierFirstPrefix[0]);
int8_t prefixLength = UPRV_LENGTHOF(gLaterFirstPrefix);
int8_t earliestFirstLength = UPRV_LENGTHOF(gEarlierFirstPrefix);
UnicodeString realPattern;
if ( intervalPattern.startsWith(gLaterFirstPrefix, prefixLength) ) {
order = true;

9
icu4c/source/i18n/dtitvinf.cpp
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (C) 2008-2015, International Business Machines Corporation and
* Copyright (C) 2008-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -21,6 +21,7 @@
#include <iostream>
#endif
#include "cmemory.h"
#include "cstring.h"
#include "unicode/msgfmt.h"
#include "unicode/uloc.h"
@ -104,9 +105,9 @@ DateIntervalInfo::setFallbackIntervalPattern(
return;
}
int32_t firstPatternIndex = fallbackPattern.indexOf(gFirstPattern,
sizeof(gFirstPattern)/sizeof(gFirstPattern[0]), 0);
UPRV_LENGTHOF(gFirstPattern), 0);
int32_t secondPatternIndex = fallbackPattern.indexOf(gSecondPattern,
sizeof(gSecondPattern)/sizeof(gSecondPattern[0]), 0);
UPRV_LENGTHOF(gSecondPattern), 0);
if ( firstPatternIndex == -1 || secondPatternIndex == -1 ) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return;
@ -481,7 +482,7 @@ DateIntervalInfo::getBestSkeleton(const UnicodeString& skeleton,
// 2 means only z/v differs
// -1 means having different field.
bestMatchDistanceInfo = 0;
int8_t fieldLength = sizeof(skeletonFieldWidth)/sizeof(skeletonFieldWidth[0]);
int8_t fieldLength = UPRV_LENGTHOF(skeletonFieldWidth);
int32_t pos = UHASH_FIRST;
const UHashElement* elem = NULL;

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

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2009, International Business Machines
* Copyright (C) 2005-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -20,8 +20,6 @@ U_NAMESPACE_BEGIN
#define BUFFER_SIZE 8192
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#define NEW_ARRAY(type,count) (type *) uprv_malloc((count) * sizeof(type))
#define DELETE_ARRAY(array) uprv_free((void *) (array))

7
icu4c/source/i18n/japancal.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 2003-2009,2012, International Business Machines Corporation and *
* others. All Rights Reserved. *
* Copyright (C) 2003-2009,2012,2016 International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
* File JAPANCAL.CPP
@ -15,6 +15,7 @@
#if !UCONFIG_NO_FORMATTING
#include "cmemory.h"
#include "japancal.h"
#include "unicode/gregocal.h"
#include "umutex.h"
@ -276,7 +277,7 @@ static const struct {
{ 1989, 1, 8 } // Heisei 235
};
#define kEraCount (sizeof(kEraInfo)/sizeof(kEraInfo[0]))
#define kEraCount UPRV_LENGTHOF(kEraInfo)
/**
* The current era, for reference.

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

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2007-2015, International Business Machines Corporation and
* Copyright (C) 2007-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -39,8 +39,6 @@
U_NAMESPACE_BEGIN
#define ARRAY_SIZE(array) (int32_t)(sizeof array / sizeof array[0])
static const UChar PLURAL_KEYWORD_OTHER[]={LOW_O,LOW_T,LOW_H,LOW_E,LOW_R,0};
static const UChar PLURAL_DEFAULT_RULE[]={LOW_O,LOW_T,LOW_H,LOW_E,LOW_R,COLON,SPACE,LOW_N,0};
static const UChar PK_IN[]={LOW_I,LOW_N,0};
@ -1059,7 +1057,7 @@ PluralRuleParser::getNumberValue(const UnicodeString& token) {
int32_t i;
char digits[128];
i = token.extract(0, token.length(), digits, ARRAY_SIZE(digits), US_INV);
i = token.extract(0, token.length(), digits, UPRV_LENGTHOF(digits), US_INV);
digits[i]='\0';
return((int32_t)atoi(digits));

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

@ -1,7 +1,7 @@
/*
**************************************************************************
* Copyright (C) 2002-2015 International Business Machines Corporation *
* and others. All rights reserved. *
* Copyright (C) 2002-2016 International Business Machines Corporation
* and others. All rights reserved.
**************************************************************************
*/
//
@ -239,7 +239,7 @@ void RegexMatcher::init2(UText *input, UErrorCode &status) {
return;
}
if (fPattern->fDataSize > (int32_t)(sizeof(fSmallData)/sizeof(fSmallData[0]))) {
if (fPattern->fDataSize > UPRV_LENGTHOF(fSmallData)) {
fData = (int64_t *)uprv_malloc(fPattern->fDataSize * sizeof(int64_t));
if (fData == NULL) {
status = fDeferredStatus = U_MEMORY_ALLOCATION_ERROR;

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

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2011-2014, International Business Machines Corporation and
* Copyright (C) 2011-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -38,7 +38,7 @@ static const char gZoneStrings[] = "zoneStrings";
static const char gMZPrefix[] = "meta:";
static const char* KEYS[] = {"lg", "ls", "ld", "sg", "ss", "sd"};
static const int32_t KEYS_SIZE = (sizeof KEYS / sizeof KEYS[0]);
static const int32_t KEYS_SIZE = UPRV_LENGTHOF(KEYS);
static const char gEcTag[] = "ec";
@ -53,7 +53,7 @@ static const UTimeZoneNameType ALL_NAME_TYPES[] = {
// stuff for TZDBTimeZoneNames
static const char* TZDBNAMES_KEYS[] = {"ss", "sd"};
static const int32_t TZDBNAMES_KEYS_SIZE = (sizeof TZDBNAMES_KEYS / sizeof TZDBNAMES_KEYS[0]);
static const int32_t TZDBNAMES_KEYS_SIZE = UPRV_LENGTHOF(TZDBNAMES_KEYS);
static UMutex gTZDBNamesMapLock = U_MUTEX_INITIALIZER;

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

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2004-2014, International Business Machines
* Copyright (C) 2004-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* file name: ucol_sit.cpp
@ -130,7 +130,7 @@ static const AttributeConversion conversions[12] = {
static UColAttributeValue
ucol_sit_letterToAttributeValue(char letter, UErrorCode *status) {
uint32_t i = 0;
for(i = 0; i < sizeof(conversions)/sizeof(conversions[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(conversions); i++) {
if(conversions[i].letter == letter) {
return conversions[i].value;
}

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

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 2005-2013, International Business Machines
* Copyright (C) 2005-2016, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*/
@ -21,8 +21,6 @@
U_NAMESPACE_USE
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#define NEW_ARRAY(type,count) (type *) uprv_malloc((count) * sizeof(type))
#define DELETE_ARRAY(array) uprv_free((void *) (array))

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

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2007-2013, International Business Machines Corporation and
* Copyright (C) 2007-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@ -538,7 +538,7 @@ static TimeZoneRule* createRuleByRRULE(const UnicodeString& zonename, int rawOff
UnicodeString rrule = *((UnicodeString*)dates->elementAt(0));
int32_t month, dayOfWeek, nthDayOfWeek, dayOfMonth = 0;
int32_t days[7];
int32_t daysCount = sizeof(days)/sizeof(days[0]);
int32_t daysCount = UPRV_LENGTHOF(days);
UDate until;
parseRRULE(rrule, month, dayOfWeek, nthDayOfWeek, days, daysCount, until, status);
@ -615,7 +615,7 @@ static TimeZoneRule* createRuleByRRULE(const UnicodeString& zonename, int rawOff
UDate tmp_until;
int32_t tmp_month, tmp_dayOfWeek, tmp_nthDayOfWeek;
int32_t tmp_days[7];
int32_t tmp_daysCount = sizeof(tmp_days)/sizeof(tmp_days[0]);
int32_t tmp_daysCount = UPRV_LENGTHOF(tmp_days);
parseRRULE(rrule, tmp_month, tmp_dayOfWeek, tmp_nthDayOfWeek, tmp_days, tmp_daysCount, tmp_until, status);
if (U_FAILURE(status)) {
return NULL;

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

@ -45,8 +45,6 @@ U_NAMESPACE_BEGIN
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(Win32DateFormat)
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#define NEW_ARRAY(type,count) (type *) uprv_malloc((count) * sizeof(type))
#define DELETE_ARRAY(array) uprv_free((void *) (array))
@ -70,7 +68,7 @@ UnicodeString* Win32DateFormat::getTimeDateFormat(const Calendar *cal, const Loc
if (U_FAILURE(status)) {
static const UChar defaultPattern[] = {0x007B, 0x0031, 0x007D, 0x0020, 0x007B, 0x0030, 0x007D, 0x0000}; // "{1} {0}"
return new UnicodeString(defaultPattern, ARRAY_SIZE(defaultPattern));
return new UnicodeString(defaultPattern, UPRV_LENGTHOF(defaultPattern));
}
int32_t resStrLen = 0;

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

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 2005-2015, International Business Machines
* Copyright (C) 2005-2016, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -144,7 +144,7 @@ Win32NumberFormat::Win32NumberFormat(const Locale &locale, UBool currency, UErro
// Resolve actual locale to be used later
UErrorCode tmpsts = U_ZERO_ERROR;
char tmpLocID[ULOC_FULLNAME_CAPACITY];
int32_t len = uloc_getLocaleForLCID(fLCID, tmpLocID, sizeof(tmpLocID)/sizeof(tmpLocID[0]) - 1, &tmpsts);
int32_t len = uloc_getLocaleForLCID(fLCID, tmpLocID, UPRV_LENGTHOF(tmpLocID) - 1, &tmpsts);
if (U_SUCCESS(tmpsts)) {
tmpLocID[len] = 0;
fLocale = Locale((const char*)tmpLocID);

4
icu4c/source/io/uprntf_p.c
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1998-2014, International Business Machines
* Copyright (C) 1998-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -143,7 +143,7 @@ u_printf_set_sign(UNumberFormat *format,
symbolLen = unum_getSymbol(format,
UNUM_PLUS_SIGN_SYMBOL,
plusSymbol,
sizeof(plusSymbol)/sizeof(*plusSymbol),
UPRV_LENGTHOF(plusSymbol),
status);
unum_setTextAttribute(format,
UNUM_POSITIVE_PREFIX,

4
icu4c/source/io/uscanf_p.c
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1998-2014, International Business Machines
* Copyright (C) 1998-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -350,7 +350,7 @@ u_scanf_skip_leading_positive_sign(UFILE *input,
symbolLen = unum_getSymbol(format,
UNUM_PLUS_SIGN_SYMBOL,
plusSymbol,
sizeof(plusSymbol)/sizeof(*plusSymbol),
UPRV_LENGTHOF(plusSymbol),
&localStatus);
if (U_SUCCESS(localStatus)) {

4
icu4c/source/io/ustdio.c
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1998-2014, International Business Machines
* Copyright (C) 1998-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -296,7 +296,7 @@ u_fputc(UChar32 uc,
int32_t idx = 0;
UBool isError = FALSE;
U16_APPEND(buf, idx, sizeof(buf)/sizeof(*buf), uc, isError);
U16_APPEND(buf, idx, UPRV_LENGTHOF(buf), uc, isError);
if (isError) {
return U_EOF;
}

4
icu4c/source/io/ustream.cpp
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2001-2014, International Business Machines
* Copyright (C) 2001-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* FILE NAME : ustream.cpp
@ -88,7 +88,7 @@ operator>>(STD_ISTREAM& stream, UnicodeString& str)
converter = u_getDefaultConverter(&errorCode);
if(U_SUCCESS(errorCode)) {
UChar *us = uBuffer;
const UChar *uLimit = uBuffer + sizeof(uBuffer)/sizeof(*uBuffer);
const UChar *uLimit = uBuffer + UPRV_LENGTHOF(uBuffer);
const char *s, *sLimit;
char ch;
UChar ch32;

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

@ -1,5 +1,5 @@
/********************************************************************
* Copyright (c) 1997-2014, International Business Machines
* Copyright (c) 1997-2016, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************/
/*****************************************************************************
@ -115,7 +115,7 @@ void TestGetSetAttr(void) {
log_err_status(status, "Unable to open collator. %s\n", u_errorName(status));
return;
}
for(i = 0; i<sizeof(attrs)/sizeof(attrs[0]); i++) {
for(i = 0; i<UPRV_LENGTHOF(attrs); i++) {
currAttr = attrs[i].att;
ucol_setAttribute(coll, currAttr, UCOL_DEFAULT, &status);
if(U_FAILURE(status)) {
@ -870,9 +870,9 @@ static void TestBengaliSortKey(void)
int32_t sortKeyLen2 = 0;
UErrorCode status = U_ZERO_ERROR;
char sortKeyStr1[2048];
uint32_t sortKeyStrLen1 = sizeof(sortKeyStr1)/sizeof(sortKeyStr1[0]);
uint32_t sortKeyStrLen1 = UPRV_LENGTHOF(sortKeyStr1);
char sortKeyStr2[2048];
uint32_t sortKeyStrLen2 = sizeof(sortKeyStr2)/sizeof(sortKeyStr2[0]);
uint32_t sortKeyStrLen2 = UPRV_LENGTHOF(sortKeyStr2);
UCollationResult result;
static UChar preRules[41] = { 0x26, 0x9fa, 0x3c, 0x98c, 0x3c, 0x9e1, 0x3c, 0x98f, 0x3c, 0x990, 0x3c, 0x993, 0x3c, 0x994, 0x3c, 0x9bc, 0x3c, 0x982, 0x3c, 0x983, 0x3c, 0x981, 0x3c, 0x9b0, 0x3c, 0x9b8, 0x3c, 0x9b9, 0x3c, 0x9bd, 0x3c, 0x9be, 0x3c, 0x9bf, 0x3c, 0x9c8, 0x3c, 0x9cb, 0x3d, 0x9cb , 0};
@ -938,8 +938,8 @@ void TestOpenVsOpenRules(){
int32_t sortKeyLen1, sortKeyLen2;
uint8_t *sortKey1 = NULL, *sortKey2 = NULL;
char sortKeyStr1[512], sortKeyStr2[512];
uint32_t sortKeyStrLen1 = sizeof(sortKeyStr1) / sizeof(sortKeyStr1[0]),
sortKeyStrLen2 = sizeof(sortKeyStr2) / sizeof(sortKeyStr2[0]);
uint32_t sortKeyStrLen1 = UPRV_LENGTHOF(sortKeyStr1),
sortKeyStrLen2 = UPRV_LENGTHOF(sortKeyStr2);
ULocaleData *uld;
int32_t x, y, z;
USet *eSet;
@ -1073,7 +1073,7 @@ void TestSortKey()
UChar *test1, *test2, *test3;
UErrorCode status = U_ZERO_ERROR;
char toStringBuffer[256], *resultP;
uint32_t toStringLen=sizeof(toStringBuffer)/sizeof(toStringBuffer[0]);
uint32_t toStringLen=UPRV_LENGTHOF(toStringBuffer);
uint8_t s1[] = { 0x9f, 0x00 };
@ -1417,7 +1417,7 @@ void TestGetLocale() {
};
/* test opening collators for different locales */
for(i = 0; i<sizeof(testStruct)/sizeof(testStruct[0]); i++) {
for(i = 0; i<UPRV_LENGTHOF(testStruct); i++) {
status = U_ZERO_ERROR;
coll = ucol_open(testStruct[i].requestedLocale, &status);
if(U_FAILURE(status)) {
@ -1605,7 +1605,7 @@ void TestBounds() {
int32_t i = 0, j = 0, k = 0, buffSize = 0, skSize = 0, lowerSize = 0, upperSize = 0;
int32_t arraySize = sizeof(tests)/sizeof(tests[0]);
int32_t arraySize = UPRV_LENGTHOF(tests);
if(U_SUCCESS(status) && coll) {
for(i = 0; i<arraySize; i++) {
@ -1656,12 +1656,12 @@ void TestBounds() {
for(i = 0; i<sizeof(test)/sizeof(test[0]); i++) {
for(i = 0; i<UPRV_LENGTHOF(test); i++) {
buffSize = u_unescape(test[i], buffer, 512);
skSize = ucol_getSortKey(coll, buffer, buffSize, sortkey, 512);
lowerSize = ucol_getBound(sortkey, skSize, UCOL_BOUND_LOWER, 1, lower, 512, &status);
upperSize = ucol_getBound(sortkey, skSize, UCOL_BOUND_UPPER_LONG, 1, upper, 512, &status);
for(j = i+1; j<sizeof(test)/sizeof(test[0]); j++) {
for(j = i+1; j<UPRV_LENGTHOF(test); j++) {
buffSize = u_unescape(test[j], buffer, 512);
skSize = ucol_getSortKey(coll, buffer, buffSize, sortkey, 512);
if(strcmp((const char *)lower, (const char *)sortkey) > 0) {
@ -1904,7 +1904,7 @@ void TestMergeSortKeys(void) {
"abcd",
"abcde"
};
uint32_t casesSize = sizeof(cases)/sizeof(cases[0]);
uint32_t casesSize = UPRV_LENGTHOF(cases);
const char* prefix = "foo";
const char* suffix = "egg";
char outBuff1[256], outBuff2[256];
@ -2061,7 +2061,7 @@ static void TestShortString(void)
const char* locale = NULL;
for(i = 0; i < sizeof(testCases)/sizeof(testCases[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(testCases); i++) {
status = U_ZERO_ERROR;
if(testCases[i].locale) {
locale = testCases[i].locale;
@ -2217,7 +2217,7 @@ TestGetContractionsAndUnsafes(void)
UChar buffer[65536];
int32_t setLen = 0;
for(i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(tests); i++) {
log_verbose("Testing locale: %s\n", tests[i].locale);
coll = ucol_open(tests[i].locale, &status);
if (coll == NULL || U_FAILURE(status)) {
@ -2332,11 +2332,11 @@ TestOpenBinary(void)
}
#endif
genericOrderingTest(coll, wUCA, sizeof(wUCA)/sizeof(wUCA[0]));
genericOrderingTest(coll, wUCA, UPRV_LENGTHOF(wUCA));
genericOrderingTest(cloneWUCA, wUCA, sizeof(wUCA)/sizeof(wUCA[0]));
genericOrderingTest(cloneWUCA, wUCA, UPRV_LENGTHOF(wUCA));
#if OPEN_BINARY_ACCEPTS_NULL_BASE
genericOrderingTest(cloneNOUCA, noUCA, sizeof(noUCA)/sizeof(noUCA[0]));
genericOrderingTest(cloneNOUCA, noUCA, UPRV_LENGTHOF(noUCA));
#endif
if(image != imageBuffer) {

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -774,13 +774,13 @@ typedef struct {
} RBBITailoringTest;
static const RBBITailoringTest tailoringTests[] = {
{ "en", UBRK_CHARACTER, thTest, thTestOffs_thFwd, thTestOffs_thRev, sizeof(thTestOffs_thFwd)/sizeof(thTestOffs_thFwd[0]) },
{ "en_US_POSIX", UBRK_CHARACTER, thTest, thTestOffs_thFwd, thTestOffs_thRev, sizeof(thTestOffs_thFwd)/sizeof(thTestOffs_thFwd[0]) },
{ "en", UBRK_LINE, heTest, heTestOffs_heFwd, heTestOffs_heRev, sizeof(heTestOffs_heFwd)/sizeof(heTestOffs_heFwd[0]) },
{ "he", UBRK_LINE, heTest, heTestOffs_heFwd, heTestOffs_heRev, sizeof(heTestOffs_heFwd)/sizeof(heTestOffs_heFwd[0]) },
{ "en", UBRK_LINE, fiTest, fiTestOffs_enFwd, fiTestOffs_enRev, sizeof(fiTestOffs_enFwd)/sizeof(fiTestOffs_enFwd[0]) },
{ "fi", UBRK_LINE, fiTest, fiTestOffs_fiFwd, fiTestOffs_fiRev, sizeof(fiTestOffs_fiFwd)/sizeof(fiTestOffs_fiFwd[0]) },
{ "km", UBRK_WORD, kmTest, kmTestOffs_kmFwd, kmTestOffs_kmRev, sizeof(kmTestOffs_kmFwd)/sizeof(kmTestOffs_kmFwd[0]) },
{ "en", UBRK_CHARACTER, thTest, thTestOffs_thFwd, thTestOffs_thRev, UPRV_LENGTHOF(thTestOffs_thFwd) },
{ "en_US_POSIX", UBRK_CHARACTER, thTest, thTestOffs_thFwd, thTestOffs_thRev, UPRV_LENGTHOF(thTestOffs_thFwd) },
{ "en", UBRK_LINE, heTest, heTestOffs_heFwd, heTestOffs_heRev, UPRV_LENGTHOF(heTestOffs_heFwd) },
{ "he", UBRK_LINE, heTest, heTestOffs_heFwd, heTestOffs_heRev, UPRV_LENGTHOF(heTestOffs_heFwd) },
{ "en", UBRK_LINE, fiTest, fiTestOffs_enFwd, fiTestOffs_enRev, UPRV_LENGTHOF(fiTestOffs_enFwd) },
{ "fi", UBRK_LINE, fiTest, fiTestOffs_fiFwd, fiTestOffs_fiRev, UPRV_LENGTHOF(fiTestOffs_fiFwd) },
{ "km", UBRK_WORD, kmTest, kmTestOffs_kmFwd, kmTestOffs_kmRev, UPRV_LENGTHOF(kmTestOffs_kmFwd) },
{ NULL, 0, NULL, NULL, NULL, 0 },
};

49
icu4c/source/test/cintltst/cbididat.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2013, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/* file name: cbididat.c
@ -16,6 +16,7 @@
#include "unicode/uchar.h"
#include "unicode/ubidi.h"
#include "cbiditst.h"
#include "cmemory.h"
const char * const
dirPropNames[U_CHAR_DIRECTION_COUNT]={
@ -374,75 +375,75 @@ testVisualMapXX[]={
const BiDiTestData
tests[]={
{testText1, ARRAY_LENGTH(testText1), UBIDI_DEFAULT_LTR, -1, -1,
{testText1, UPRV_LENGTHOF(testText1), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_LTR, 0,
testLevels1, testVisualMap1},
{testText2, ARRAY_LENGTH(testText2), UBIDI_DEFAULT_LTR, -1, -1,
{testText2, UPRV_LENGTHOF(testText2), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_RTL, 1,
testLevels2, testVisualMap2},
{testText3, ARRAY_LENGTH(testText3), UBIDI_DEFAULT_LTR, -1, -1,
{testText3, UPRV_LENGTHOF(testText3), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_LTR, 0,
testLevels3, testVisualMap3},
{testText4, ARRAY_LENGTH(testText4), UBIDI_DEFAULT_LTR, -1, -1,
{testText4, UPRV_LENGTHOF(testText4), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_MIXED, 0,
testLevels4, testVisualMap4},
{testText5, ARRAY_LENGTH(testText5), UBIDI_DEFAULT_LTR, -1, -1,
{testText5, UPRV_LENGTHOF(testText5), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_MIXED, 1,
testLevels5, testVisualMap5},
{testText6, ARRAY_LENGTH(testText6), UBIDI_DEFAULT_LTR, -1, -1,
{testText6, UPRV_LENGTHOF(testText6), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_MIXED, 1,
testLevels6, testVisualMap6},
{NULL, 0, UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_LTR, 0,
NULL, NULL},
{testText8, ARRAY_LENGTH(testText8), UBIDI_DEFAULT_LTR, -1, -1,
{testText8, UPRV_LENGTHOF(testText8), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_RTL, 1,
testLevels8, testVisualMap8},
{testText9, ARRAY_LENGTH(testText9), 64, -1, -1,
{testText9, UPRV_LENGTHOF(testText9), 64, -1, -1,
UBIDI_MIXED, 64,
testLevels9, testVisualMap9},
{testText10, ARRAY_LENGTH(testText10), 64, -1, -1,
{testText10, UPRV_LENGTHOF(testText10), 64, -1, -1,
UBIDI_MIXED, 64,
testLevels10, testVisualMap10},
{testText11, ARRAY_LENGTH(testText11), UBIDI_DEFAULT_LTR, -1, -1,
{testText11, UPRV_LENGTHOF(testText11), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_MIXED, 0,
testLevels11, testVisualMap11},
{testText12, ARRAY_LENGTH(testText12), UBIDI_DEFAULT_LTR, -1, -1,
{testText12, UPRV_LENGTHOF(testText12), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_MIXED, 0,
testLevels12, testVisualMap12},
{testText12, ARRAY_LENGTH(testText12), UBIDI_DEFAULT_RTL, -1, -1,
{testText12, UPRV_LENGTHOF(testText12), UBIDI_DEFAULT_RTL, -1, -1,
UBIDI_MIXED, 0,
testLevels13, testVisualMap13},
{testText12, ARRAY_LENGTH(testText12), 2, -1, -1,
{testText12, UPRV_LENGTHOF(testText12), 2, -1, -1,
UBIDI_MIXED, 2,
testLevels14, testVisualMap14},
{testText12, ARRAY_LENGTH(testText12), 5, -1, -1,
{testText12, UPRV_LENGTHOF(testText12), 5, -1, -1,
UBIDI_MIXED, 5,
testLevels15, testVisualMap15},
{testText12, ARRAY_LENGTH(testText12), UBIDI_DEFAULT_LTR, -1, -1,
{testText12, UPRV_LENGTHOF(testText12), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_MIXED, 0,
testLevels16, testVisualMap16},
{testText13, ARRAY_LENGTH(testText13), UBIDI_DEFAULT_LTR, -1, -1,
{testText13, UPRV_LENGTHOF(testText13), UBIDI_DEFAULT_LTR, -1, -1,
UBIDI_MIXED, 0,
testLevels17, testVisualMap17},
{testText13, ARRAY_LENGTH(testText13), UBIDI_DEFAULT_LTR, 0, 6,
{testText13, UPRV_LENGTHOF(testText13), UBIDI_DEFAULT_LTR, 0, 6,
UBIDI_MIXED, 0,
testLevels18, testVisualMap18},
{testText14, ARRAY_LENGTH(testText14), UBIDI_DEFAULT_LTR, 13, 14,
{testText14, UPRV_LENGTHOF(testText14), UBIDI_DEFAULT_LTR, 13, 14,
UBIDI_RTL, 1,
testLevels19, testVisualMap19},
{testText15, ARRAY_LENGTH(testText15), UBIDI_DEFAULT_LTR, 2, 3,
{testText15, UPRV_LENGTHOF(testText15), UBIDI_DEFAULT_LTR, 2, 3,
UBIDI_LTR, 2,
testLevels20, testVisualMap19},
{testText16, ARRAY_LENGTH(testText16), UBIDI_RTL, 0, 8,
{testText16, UPRV_LENGTHOF(testText16), UBIDI_RTL, 0, 8,
UBIDI_MIXED, 1,
testLevels21, testVisualMap20},
{testText17, ARRAY_LENGTH(testText17), UBIDI_LTR, 0, 8,
{testText17, UPRV_LENGTHOF(testText17), UBIDI_LTR, 0, 8,
UBIDI_MIXED, 0,
testLevels22, testVisualMap21},
{testTextXX, ARRAY_LENGTH(testTextXX), UBIDI_RTL, -1, -1,
{testTextXX, UPRV_LENGTHOF(testTextXX), UBIDI_RTL, -1, -1,
UBIDI_MIXED, 1, testLevelsXX, testVisualMapXX}
};
const int
bidiTestCount=ARRAY_LENGTH(tests);
bidiTestCount=UPRV_LENGTHOF(tests);

5
icu4c/source/test/cintltst/cbiditst.h
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2013, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/* file name: cbiditst.h
@ -25,9 +25,6 @@ extern "C" {
#define MAX_STRING_LENGTH 200
/* length of an array */
#define ARRAY_LENGTH(array) (sizeof(array)/sizeof(array[0]))
/* Comparing the description of the BiDi algorithm with this implementation
is easier with the same names for the BiDi types in the code as there.
See UCharDirection in uchar.h .

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

@ -27,6 +27,7 @@
#include "cintltst.h"
#include "ccaltst.h"
#include "cformtst.h"
#include "cmemory.h"
#include "cstring.h"
#include "ulist.h"
@ -225,7 +226,7 @@ static void TestCalendar()
/*Test ucal_set/getDefaultTimeZone*/
status = U_ZERO_ERROR;
i = ucal_getDefaultTimeZone(zone1, sizeof(zone1)/sizeof(zone1[0]), &status);
i = ucal_getDefaultTimeZone(zone1, UPRV_LENGTHOF(zone1), &status);
if (U_FAILURE(status)) {
log_err("FAIL: ucal_getDefaultTimeZone() => %s\n",
u_errorName(status));
@ -235,7 +236,7 @@ static void TestCalendar()
log_err("FAIL: ucal_setDefaultTimeZone(Europe/Paris) => %s\n",
u_errorName(status));
} else {
i = ucal_getDefaultTimeZone(zone2, sizeof(zone2)/sizeof(zone2[0]), &status);
i = ucal_getDefaultTimeZone(zone2, UPRV_LENGTHOF(zone2), &status);
if (U_FAILURE(status)) {
log_err("FAIL: ucal_getDefaultTimeZone() => %s\n",
u_errorName(status));
@ -596,7 +597,7 @@ static void TestGetSetDateAPI()
/*testing ucal_setTimeZone() and ucal_getTimeZoneID function*/
log_verbose("\nTesting if the function ucal_setTimeZone() and ucal_getTimeZoneID work fine\n");
idLen = ucal_getTimeZoneID(caldef2, id, sizeof(id)/sizeof(id[0]), &status);
idLen = ucal_getTimeZoneID(caldef2, id, UPRV_LENGTHOF(id), &status);
(void)idLen; /* Suppress set but not used warning. */
if (U_FAILURE(status)) {
log_err("Error in getTimeZoneID : %s\n", u_errorName(status));
@ -620,7 +621,7 @@ static void TestGetSetDateAPI()
else
log_verbose("ucal_setTimeZone worked fine\n");
idLen = ucal_getTimeZoneID(caldef2, id, sizeof(id)/sizeof(id[0]), &status);
idLen = ucal_getTimeZoneID(caldef2, id, UPRV_LENGTHOF(id), &status);
if (U_FAILURE(status)) {
log_err("Error in getTimeZoneID : %s\n", u_errorName(status));
} else if (u_strcmp(id, tzID) != 0) {
@ -1694,8 +1695,8 @@ static const TestWeekendDates weekendDates_ar_OM[] = {
{ 2000, UCAL_MARCH, 18, 8, 0, 1 }, /* Sat 08:00 */
};
static const TestWeekendDatesList testDates[] = {
{ "en_US", weekendDates_en_US, sizeof(weekendDates_en_US)/sizeof(weekendDates_en_US[0]) },
{ "ar_OM", weekendDates_ar_OM, sizeof(weekendDates_ar_OM)/sizeof(weekendDates_ar_OM[0]) },
{ "en_US", weekendDates_en_US, UPRV_LENGTHOF(weekendDates_en_US) },
{ "ar_OM", weekendDates_ar_OM, UPRV_LENGTHOF(weekendDates_ar_OM) },
};
typedef struct {
@ -1728,17 +1729,17 @@ static const TestDaysOfWeek daysOfWeek_hi_IN[] = { /* Sunday only */
{ UCAL_SUNDAY, UCAL_WEEKEND, 0 },
};
static const TestDaysOfWeekList testDays[] = {
{ "en_US", daysOfWeek_en_US, sizeof(daysOfWeek_en_US)/sizeof(daysOfWeek_en_US[0]) },
{ "ar_OM", daysOfWeek_ar_OM, sizeof(daysOfWeek_ar_OM)/sizeof(daysOfWeek_ar_OM[0]) },
{ "hi_IN", daysOfWeek_hi_IN, sizeof(daysOfWeek_hi_IN)/sizeof(daysOfWeek_hi_IN[0]) },
{ "en_US@rg=OMZZZZ", daysOfWeek_ar_OM, sizeof(daysOfWeek_ar_OM)/sizeof(daysOfWeek_ar_OM[0]) },
{ "hi@rg=USZZZZ", daysOfWeek_en_US, sizeof(daysOfWeek_en_US)/sizeof(daysOfWeek_en_US[0]) },
{ "en_US", daysOfWeek_en_US, UPRV_LENGTHOF(daysOfWeek_en_US) },
{ "ar_OM", daysOfWeek_ar_OM, UPRV_LENGTHOF(daysOfWeek_ar_OM) },
{ "hi_IN", daysOfWeek_hi_IN, UPRV_LENGTHOF(daysOfWeek_hi_IN) },
{ "en_US@rg=OMZZZZ", daysOfWeek_ar_OM, UPRV_LENGTHOF(daysOfWeek_ar_OM) },
{ "hi@rg=USZZZZ", daysOfWeek_en_US, UPRV_LENGTHOF(daysOfWeek_en_US) },
};
static const UChar logDateFormat[] = { 0x0045,0x0045,0x0045,0x0020,0x004D,0x004D,0x004D,0x0020,0x0064,0x0064,0x0020,0x0079,
0x0079,0x0079,0x0079,0x0020,0x0047,0x0020,0x0048,0x0048,0x003A,0x006D,0x006D,0x003A,
0x0073,0x0073,0x002E,0x0053,0x0053,0x0053,0 }; /* "EEE MMM dd yyyy G HH:mm:ss.SSS" */
enum { kFormattedDateMax = 2*sizeof(logDateFormat)/sizeof(logDateFormat[0]) };
enum { kFormattedDateMax = 2*UPRV_LENGTHOF(logDateFormat) };
static void TestWeekend() {
const TestWeekendDatesList * testDatesPtr = testDates;
@ -1753,7 +1754,7 @@ static void TestWeekend() {
log_data_err("Unable to create UDateFormat - %s\n", u_errorName(fmtStatus));
return;
}
for (count = sizeof(testDates)/sizeof(testDates[0]); count-- > 0; ++testDatesPtr) {
for (count = UPRV_LENGTHOF(testDates); count-- > 0; ++testDatesPtr) {
UErrorCode status = U_ZERO_ERROR;
UCalendar * cal = ucal_open(NULL, 0, testDatesPtr->locale, UCAL_GREGORIAN, &status);
log_verbose("locale: %s\n", testDatesPtr->locale);
@ -1797,7 +1798,7 @@ static void TestWeekend() {
udat_close(fmt);
}
for (count = sizeof(testDays)/sizeof(testDays[0]); count-- > 0; ++testDaysPtr) {
for (count = UPRV_LENGTHOF(testDays); count-- > 0; ++testDaysPtr) {
UErrorCode status = U_ZERO_ERROR;
UCalendar * cal = ucal_open(NULL, 0, testDaysPtr->locale, UCAL_GREGORIAN, &status);
log_verbose("locale: %s\n", testDaysPtr->locale);
@ -2381,7 +2382,7 @@ void TestGetWindowsTimeZoneID() {
{
status = U_ZERO_ERROR;
len = ucal_getWindowsTimeZoneID(tzNewYork, u_strlen(tzNewYork), winID, sizeof(winID)/sizeof(winID[0]), &status);
len = ucal_getWindowsTimeZoneID(tzNewYork, u_strlen(tzNewYork), winID, UPRV_LENGTHOF(winID), &status);
if (U_FAILURE(status)) {
log_data_err("FAIL: Windows ID for America/New_York, status %s\n", u_errorName(status));
} else if (len != u_strlen(winEastern) || u_strncmp(winID, winEastern, len) != 0) {
@ -2390,7 +2391,7 @@ void TestGetWindowsTimeZoneID() {
}
{
status = U_ZERO_ERROR;
len = ucal_getWindowsTimeZoneID(tzTronto, u_strlen(tzTronto), winID, sizeof(winID)/sizeof(winID[0]), &status);
len = ucal_getWindowsTimeZoneID(tzTronto, u_strlen(tzTronto), winID, UPRV_LENGTHOF(winID), &status);
if (U_FAILURE(status)) {
log_data_err("FAIL: Windows ID for America/Toronto, status %s\n", u_errorName(status));
} else if (len != u_strlen(winEastern) || u_strncmp(winID, winEastern, len) != 0) {
@ -2399,7 +2400,7 @@ void TestGetWindowsTimeZoneID() {
}
{
status = U_ZERO_ERROR;
len = ucal_getWindowsTimeZoneID(sBogus, u_strlen(sBogus), winID, sizeof(winID)/sizeof(winID[0]), &status);
len = ucal_getWindowsTimeZoneID(sBogus, u_strlen(sBogus), winID, UPRV_LENGTHOF(winID), &status);
if (U_FAILURE(status)) {
log_data_err("FAIL: Windows ID for Bogus, status %s\n", u_errorName(status));
} else if (len != 0) {
@ -2415,7 +2416,7 @@ void TestGetTimeZoneIDByWindowsID() {
{
status = U_ZERO_ERROR;
len = ucal_getTimeZoneIDForWindowsID(winEastern, -1, NULL, tzID, sizeof(tzID)/sizeof(tzID[0]), &status);
len = ucal_getTimeZoneIDForWindowsID(winEastern, -1, NULL, tzID, UPRV_LENGTHOF(tzID), &status);
if (U_FAILURE(status)) {
log_data_err("FAIL: TZ ID for Eastern Standard Time, status %s\n", u_errorName(status));
} else if (len != u_strlen(tzNewYork) || u_strncmp(tzID, tzNewYork, len) != 0) {
@ -2424,7 +2425,7 @@ void TestGetTimeZoneIDByWindowsID() {
}
{
status = U_ZERO_ERROR;
len = ucal_getTimeZoneIDForWindowsID(winEastern, u_strlen(winEastern), "US", tzID, sizeof(tzID)/sizeof(tzID[0]), &status);
len = ucal_getTimeZoneIDForWindowsID(winEastern, u_strlen(winEastern), "US", tzID, UPRV_LENGTHOF(tzID), &status);
if (U_FAILURE(status)) {
log_data_err("FAIL: TZ ID for Eastern Standard Time - US, status %s\n", u_errorName(status));
} else if (len != u_strlen(tzNewYork) || u_strncmp(tzID, tzNewYork, len) != 0) {
@ -2433,7 +2434,7 @@ void TestGetTimeZoneIDByWindowsID() {
}
{
status = U_ZERO_ERROR;
len = ucal_getTimeZoneIDForWindowsID(winEastern, u_strlen(winEastern), "CA", tzID, sizeof(tzID)/sizeof(tzID[0]), &status);
len = ucal_getTimeZoneIDForWindowsID(winEastern, u_strlen(winEastern), "CA", tzID, UPRV_LENGTHOF(tzID), &status);
if (U_FAILURE(status)) {
log_data_err("FAIL: TZ ID for Eastern Standard Time - CA, status %s\n", u_errorName(status));
} else if (len != u_strlen(tzTronto) || u_strncmp(tzID, tzTronto, len) != 0) {
@ -2443,7 +2444,7 @@ void TestGetTimeZoneIDByWindowsID() {
{
status = U_ZERO_ERROR;
len = ucal_getTimeZoneIDForWindowsID(sBogus, -1, NULL, tzID, sizeof(tzID)/sizeof(tzID[0]), &status);
len = ucal_getTimeZoneIDForWindowsID(sBogus, -1, NULL, tzID, UPRV_LENGTHOF(tzID), &status);
if (U_FAILURE(status)) {
log_data_err("FAIL: TZ ID for Bogus, status %s\n", u_errorName(status));
} else if (len != 0) {

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*****************************************************************************
@ -412,7 +412,7 @@ static void TestConvert()
const uint8_t source[]={ 0x00, 0x04, 0x05, 0x06, 0xa2, 0xb4, 0x00};
const uint8_t expectedTarget[]={ 0x00, 0x37, 0x2d, 0x2e, 0x0e, 0x49, 0x62, 0x0f, 0x00};
char *target=0;
sourceLimit=sizeof(source)/sizeof(source[0]);
sourceLimit=UPRV_LENGTHOF(source);
err=U_ZERO_ERROR;
targetLimit=0;
@ -447,14 +447,14 @@ static void TestConvert()
}
err=U_ILLEGAL_ARGUMENT_ERROR;
sourceLimit=sizeof(source)/sizeof(source[0]);
sourceLimit=UPRV_LENGTHOF(source);
i=ucnv_convert("ibm-1364", "ibm-1363", target, targetLimit , (const char*)source, sourceLimit, &err);
if(i !=0 ){
log_err("FAILURE! ucnv_convert() with err=U_ILLEGAL_ARGUMENT_ERROR is expected to return 0\n");
}
err=U_ZERO_ERROR;
sourceLimit=sizeof(source)/sizeof(source[0]);
sourceLimit=UPRV_LENGTHOF(source);
targetLimit=0;
i=ucnv_convert("ibm-1364", "ibm-1363", target, targetLimit , (const char*)source, sourceLimit, &err);
if(!(U_FAILURE(err) && err==U_BUFFER_OVERFLOW_ERROR)){
@ -1165,7 +1165,7 @@ static void TestAlias() {
{ "UTF32_PlatformEndian", "UTF32_PlatformEndian" },
{ "UTF-32", "ucs-4" }
};
int32_t CONVERTERS_NAMES_LENGTH = sizeof(CONVERTERS_NAMES) / sizeof(*CONVERTERS_NAMES);
int32_t CONVERTERS_NAMES_LENGTH = UPRV_LENGTHOF(CONVERTERS_NAMES);
/* When there are bugs in gencnval or in ucnv_io, converters can
appear to have no aliases. */
@ -1693,16 +1693,16 @@ static void TestConvertSafeClone()
char *pCharBuffer;
const char *pConstCharBuffer;
const char *charBufferLimit = charBuffer + sizeof(charBuffer)/sizeof(*charBuffer);
const char *charBufferLimit = charBuffer + UPRV_LENGTHOF(charBuffer);
UChar uniBuffer[] = {0x0058, 0x0059, 0x005A}; /* "XYZ" */
UChar uniCharBuffer[20];
char charSourceBuffer[] = { 0x1b, 0x24, 0x42 };
const char *pCharSource = charSourceBuffer;
const char *pCharSourceLimit = charSourceBuffer + sizeof(charSourceBuffer);
UChar *pUCharTarget = uniCharBuffer;
UChar *pUCharTargetLimit = uniCharBuffer + sizeof(uniCharBuffer)/sizeof(*uniCharBuffer);
UChar *pUCharTargetLimit = uniCharBuffer + UPRV_LENGTHOF(uniCharBuffer);
const UChar * pUniBuffer;
const UChar *uniBufferLimit = uniBuffer + sizeof(uniBuffer)/sizeof(*uniBuffer);
const UChar *uniBufferLimit = uniBuffer + UPRV_LENGTHOF(uniBuffer);
int32_t idx, j;
err = U_ZERO_ERROR;

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2009, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -27,8 +27,6 @@
#include "unicode/ustring.h"
#include "cmemory.h"
#define ARRAY_LENGTH(array) (sizeof array / sizeof array[0])
void addCurrencyCollTest(TestNode** root)
{
@ -117,9 +115,9 @@ void currTest()
/*Compare each currency symbol against all the
currency symbols, including itself*/
for (i = 0; i < ARRAY_LENGTH(currency); i += 1)
for (i = 0; i < UPRV_LENGTHOF(currency); i += 1)
{
for (j = 0; j < ARRAY_LENGTH(currency); j += 1)
for (j = 0; j < UPRV_LENGTHOF(currency); j += 1)
{
u_strcpy(source, currency[i]);
u_strcpy(target, currency[j]);

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

@ -1,5 +1,5 @@
/********************************************************************
* Copyright (c) 2011-2015, International Business Machines Corporation
* Copyright (c) 2011-2016, International Business Machines Corporation
* and others. All Rights Reserved.
********************************************************************/
/* C API TEST FOR DATE INTERVAL FORMAT */
@ -18,8 +18,6 @@
static void TestDateIntervalFormat(void);
static void TestFPos_SkelWithSeconds(void);
#define LEN(a) (sizeof(a)/sizeof(a[0]))
void addDateIntervalFormatTest(TestNode** root);
#define TESTCASE(x) addTest(root, &x, "tsformat/cdateintervalformattest/" #x)
@ -136,7 +134,7 @@ static const double deltas[] = {
8640000000.0, // 100 days
-1.0
};
enum { kNumDeltas = sizeof(deltas)/sizeof(deltas[0]) - 1 };
enum { kNumDeltas = UPRV_LENGTHOF(deltas) - 1 };
typedef struct {
int32_t posBegin;

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -41,8 +41,6 @@ static void TestCalendarDateParse(void);
static void TestParseErrorReturnValue(void);
static void TestFormatForFields(void);
#define LEN(a) (sizeof(a)/sizeof(a[0]))
void addDateForTest(TestNode** root);
#define TESTCASE(x) addTest(root, &x, "tsformat/cdattst/" #x)
@ -1288,7 +1286,7 @@ static void TestExtremeDates() {
return;
}
_aux2ExtremeDates(fmt, small, large, buf, LEN(buf), cbuf, 0, &ec);
_aux2ExtremeDates(fmt, small, large, buf, UPRV_LENGTHOF(buf), cbuf, 0, &ec);
udat_close(fmt);
}
@ -1300,8 +1298,8 @@ static void TestAllLocales(void) {
};
localeCount = uloc_countAvailable();
for (idx = 0; idx < localeCount; idx++) {
for (dateIdx = 0; dateIdx < (int32_t)(sizeof(style)/sizeof(style[0])); dateIdx++) {
for (timeIdx = 0; timeIdx < (int32_t)(sizeof(style)/sizeof(style[0])); timeIdx++) {
for (dateIdx = 0; dateIdx < UPRV_LENGTHOF(style); dateIdx++) {
for (timeIdx = 0; timeIdx < UPRV_LENGTHOF(style); timeIdx++) {
UErrorCode status = U_ZERO_ERROR;
udat_close(udat_open(style[dateIdx], style[timeIdx],
uloc_getAvailable(idx), NULL, 0, NULL, 0, &status));
@ -1390,7 +1388,7 @@ static void TestRelativeCrash(void) {
UErrorCode subStatus = U_ZERO_ERROR;
what = "udat_getSymbols";
log_verbose("Trying %s on a relative date..\n", what);
udat_getSymbols(icudf, UDAT_ERAS,0,erabuf,sizeof(erabuf)/sizeof(erabuf[0]), &subStatus);
udat_getSymbols(icudf, UDAT_ERAS,0,erabuf,UPRV_LENGTHOF(erabuf), &subStatus);
if(subStatus == U_ZERO_ERROR) {
log_verbose("Success: %s returned %s.\n", what, u_errorName(subStatus));
} else {

7
icu4c/source/test/cintltst/cfrtst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2010, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -30,6 +30,7 @@
#include "ccolltst.h"
#include "callcoll.h"
#include "cfrtst.h"
#include "cmemory.h"
#include "unicode/ustring.h"
#include "string.h"
@ -182,7 +183,7 @@ static void TestSecondary()
}
log_verbose("Testing fr_CA Collation with Secondary strength\n");
/*test acute and grave ordering (compare to french collation)*/
testAcuteSize = sizeof(testAcute) / sizeof(testAcute[0]);
testAcuteSize = UPRV_LENGTHOF(testAcute);
for (i = 0; i < testAcuteSize; i++)
{
for (j = 0; j < testAcuteSize; j++)
@ -320,7 +321,7 @@ static void TestGetSortKey() {
lenActualSortKey = ucol_getSortKey(pCollator,
(const UChar *)pucUTF16,
sizeof(pucUTF16) / sizeof(pucUTF16[0]),
UPRV_LENGTHOF(pucUTF16),
pucSortKey,
LENSORTKEY);

8
icu4c/source/test/cintltst/citertst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2014, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -1134,7 +1134,7 @@ static const UChar tsceText[] = { /* Nothing in here should be ignorable */
0x0020, 0x1E4D, /* small letter o with tilde and acute, decomposes */
0x0020
};
enum { kLen_tsceText = sizeof(tsceText)/sizeof(tsceText[0]) };
enum { kLen_tsceText = UPRV_LENGTHOF(tsceText) };
static const int32_t rootStandardOffsets[] = {
0, 1,2,
@ -1150,7 +1150,7 @@ static const int32_t rootStandardOffsets[] = {
28,
29
};
enum { kLen_rootStandardOffsets = sizeof(rootStandardOffsets)/sizeof(rootStandardOffsets[0]) };
enum { kLen_rootStandardOffsets = UPRV_LENGTHOF(rootStandardOffsets) };
static const int32_t rootSearchOffsets[] = {
0, 1,2,
@ -1166,7 +1166,7 @@ static const int32_t rootSearchOffsets[] = {
28,
29
};
enum { kLen_rootSearchOffsets = sizeof(rootSearchOffsets)/sizeof(rootSearchOffsets[0]) };
enum { kLen_rootSearchOffsets = UPRV_LENGTHOF(rootSearchOffsets) };
typedef struct {
const char * locale;

15
icu4c/source/test/cintltst/cldrtest.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -12,6 +12,7 @@
#include "unicode/udat.h"
#include "unicode/uscript.h"
#include "unicode/ulocdata.h"
#include "cmemory.h"
#include "cstring.h"
#include "locmap.h"
#include "uresimp.h"
@ -38,7 +39,7 @@ createFlattenSet(USet *origSet, UErrorCode *status) {
for (idx = 0; idx < origItemCount; idx++) {
graphmeSize = uset_getItem(origSet, idx,
&start, &end,
graphme, (int32_t)(sizeof(graphme)/sizeof(graphme[0])),
graphme, UPRV_LENGTHOF(graphme),
status);
if (U_FAILURE(*status)) {
log_err("ERROR: uset_getItem returned %s\n", u_errorName(*status));
@ -463,7 +464,7 @@ testLCID(UResourceBundle *currentBundle,
}
status = U_ZERO_ERROR;
len = uprv_convertToPosix(expectedLCID, lcidStringC, sizeof(lcidStringC)/sizeof(lcidStringC[0]) - 1, &status);
len = uprv_convertToPosix(expectedLCID, lcidStringC, UPRV_LENGTHOF(lcidStringC) - 1, &status);
if (U_FAILURE(status)) {
log_err("ERROR: %.4x does not have a POSIX mapping due to %s\n",
expectedLCID, u_errorName(status));
@ -956,7 +957,7 @@ static void VerifyTranslation(void) {
int32_t langSize;
int32_t strIdx;
UChar badChar;
langSize = uloc_getDisplayLanguage(currLoc, currLoc, langBuffer, sizeof(langBuffer)/sizeof(langBuffer[0]), &errorCode);
langSize = uloc_getDisplayLanguage(currLoc, currLoc, langBuffer, UPRV_LENGTHOF(langBuffer), &errorCode);
if (U_FAILURE(errorCode)) {
log_err("error uloc_getDisplayLanguage returned %s\n", u_errorName(errorCode));
}
@ -967,7 +968,7 @@ static void VerifyTranslation(void) {
currLoc, strIdx, badChar);
}
}
langSize = uloc_getDisplayCountry(currLoc, currLoc, langBuffer, sizeof(langBuffer)/sizeof(langBuffer[0]), &errorCode);
langSize = uloc_getDisplayCountry(currLoc, currLoc, langBuffer, UPRV_LENGTHOF(langBuffer), &errorCode);
if (U_FAILURE(errorCode)) {
log_err("error uloc_getDisplayCountry returned %s\n", u_errorName(errorCode));
}
@ -1041,7 +1042,7 @@ static void VerifyTranslation(void) {
ures_close(cal);
}
errorCode = U_ZERO_ERROR;
numScripts = uscript_getCode(currLoc, scripts, sizeof(scripts)/sizeof(scripts[0]), &errorCode);
numScripts = uscript_getCode(currLoc, scripts, UPRV_LENGTHOF(scripts), &errorCode);
if (strcmp(currLoc, "yi") == 0 && numScripts > 0 && log_knownIssue("11217", "Fix result of uscript_getCode for yi: USCRIPT_YI -> USCRIPT_HEBREW")) {
scripts[0] = USCRIPT_HEBREW;
}
@ -1204,7 +1205,7 @@ static void TestExemplarSet(void){
itemCount = uset_getItemCount(exemplarSet);
for (m=0; m<itemCount && !existsInScript; ++m) {
strLen = uset_getItem(exemplarSet, m, &start, &end, ubuf,
sizeof(ubuf)/sizeof(ubuf[0]), &ec);
UPRV_LENGTHOF(ubuf), &ec);
/* failure here might mean str[] needs to be larger */
if (!assertSuccess("uset_getItem", &ec)) goto END;
if (strLen == 0) {

35
icu4c/source/test/cintltst/cloctst.c
View file

@ -17,6 +17,7 @@
#include <stdio.h>
#include <string.h>
#include "cintltst.h"
#include "cmemory.h"
#include "cstring.h"
#include "uparse.h"
#include "uresimp.h"
@ -591,7 +592,7 @@ static int32_t UCharsToEscapedAscii(const UChar* utext, int32_t len, char* resul
/*t*/ {'t', 0x09},
/*v*/ {'v', 0x0b}
};
static const int32_t ESCAPE_MAP_LENGTH = sizeof(ESCAPE_MAP)/sizeof(ESCAPE_MAP[0]);
static const int32_t ESCAPE_MAP_LENGTH = UPRV_LENGTHOF(ESCAPE_MAP);
static const char HEX_DIGITS[] = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
@ -1730,7 +1731,7 @@ static void TestKeywordVariants(void)
const char *keyword = NULL;
int32_t keywordLen = 0;
for(i = 0; i < sizeof(testCases)/sizeof(testCases[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(testCases); i++) {
status = U_ZERO_ERROR;
*buffer = 0;
keywords = uloc_openKeywords(testCases[i].localeID, &status);
@ -1837,7 +1838,7 @@ static void TestKeywordVariantParsing(void)
int32_t resultLen = 0;
char buffer[256];
for(i = 0; i < sizeof(testCases)/sizeof(testCases[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(testCases); i++) {
*buffer = 0;
resultLen = uloc_getKeywordValue(testCases[i].localeID, testCases[i].keyword, buffer, 256, &status);
(void)resultLen; /* Suppress set but not used warning. */
@ -1908,7 +1909,7 @@ static void TestKeywordSet(void)
char cbuffer[1024];
for(i = 0; i < sizeof(kwSetTestCases)/sizeof(kwSetTestCases[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(kwSetTestCases); i++) {
UErrorCode status = U_ZERO_ERROR;
memset(buffer,'%',1023);
strcpy(buffer, kwSetTestCases[i].l);
@ -2130,7 +2131,7 @@ static void TestCanonicalization(void)
int32_t i, j, resultLen = 0, origResultLen;
char buffer[256];
for (i=0; i < sizeof(testCases)/sizeof(testCases[0]); i++) {
for (i=0; i < UPRV_LENGTHOF(testCases); i++) {
for (j=0; j<2; ++j) {
const char* expected = (j==0) ? testCases[i].getNameID : testCases[i].canonicalID;
*buffer = 0;
@ -2192,7 +2193,7 @@ static void TestDisplayKeywords(void)
{0x0053, 0x006f, 0x0072, 0x0074, 0x0069, 0x0065, 0x0072, 0x0075, 0x006e, 0x0067, 0x0000}
},
};
for(i = 0; i < sizeof(testCases)/sizeof(testCases[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(testCases); i++) {
UErrorCode status = U_ZERO_ERROR;
const char* keyword =NULL;
int32_t keywordLen = 0;
@ -2274,7 +2275,7 @@ static void TestDisplayKeywordValues(void){
{0x004a, 0x0061, 0x0070, 0x0061, 0x006e, 0x0069, 0x0073, 0x0063, 0x0068, 0x0065, 0x0072, 0x0020, 0x004b, 0x0061, 0x006c, 0x0065, 0x006e, 0x0064, 0x0065, 0x0072, 0x0000}
},
};
for(i = 0; i < sizeof(testCases)/sizeof(testCases[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(testCases); i++) {
UErrorCode status = U_ZERO_ERROR;
const char* keyword =NULL;
int32_t keywordLen = 0;
@ -2403,7 +2404,7 @@ static void TestGetBaseName(void) {
char baseName[256];
UErrorCode status = U_ZERO_ERROR;
for(i = 0; i < sizeof(testCases)/sizeof(testCases[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(testCases); i++) {
baseNameLen = uloc_getBaseName(testCases[i].localeID, baseName, 256, &status);
(void)baseNameLen; /* Suppress set but not used warning. */
if(strcmp(testCases[i].baseName, baseName)) {
@ -2441,7 +2442,7 @@ static void TestDisplayNameWarning(void) {
int32_t size;
UErrorCode status = U_ZERO_ERROR;
size = uloc_getDisplayLanguage("qqq", "kl", name, sizeof(name)/sizeof(name[0]), &status);
size = uloc_getDisplayLanguage("qqq", "kl", name, UPRV_LENGTHOF(name), &status);
(void)size; /* Suppress set but not used warning. */
if (status != U_USING_DEFAULT_WARNING) {
log_err("For language \"qqq\" in locale \"kl\", expecting U_USING_DEFAULT_WARNING, but got %s\n",
@ -2785,7 +2786,7 @@ static void TestAcceptLanguage(void) {
/*6*/{ 6, NULL, "ja", ULOC_ACCEPT_FALLBACK }, /* XF */
/*7*/{ 7, NULL, "zh", ULOC_ACCEPT_FALLBACK }, /* XF */
};
const int32_t numTests = sizeof(tests)/sizeof(tests[0]);
const int32_t numTests = UPRV_LENGTHOF(tests);
static const char *http[] = {
/*0*/ "mt-mt, ja;q=0.76, en-us;q=0.95, en;q=0.92, en-gb;q=0.89, fr;q=0.87, iu-ca;q=0.84, iu;q=0.82, ja-jp;q=0.79, mt;q=0.97, de-de;q=0.74, de;q=0.71, es;q=0.68, it-it;q=0.66, it;q=0.63, vi-vn;q=0.61, vi;q=0.58, nl-nl;q=0.55, nl;q=0.53, th-th-traditional;q=.01",
/*1*/ "ja;q=0.5, en;q=0.8, tlh",
@ -3023,7 +3024,7 @@ static void TestOrientation()
};
size_t i = 0;
for (; i < sizeof(toTest) / sizeof(toTest[0]); ++i) {
for (; i < UPRV_LENGTHOF(toTest); ++i) {
UErrorCode statusCO = U_ZERO_ERROR;
UErrorCode statusLO = U_ZERO_ERROR;
const char* const localeId = toTest[i].localeId;
@ -5578,7 +5579,7 @@ static void TestLikelySubtags()
char buffer[ULOC_FULLNAME_CAPACITY + ULOC_KEYWORD_AND_VALUES_CAPACITY + 1];
int32_t i = 0;
for (; i < sizeof(basic_maximize_data) / sizeof(basic_maximize_data[0]); ++i)
for (; i < UPRV_LENGTHOF(basic_maximize_data); ++i)
{
UErrorCode status = U_ZERO_ERROR;
const char* const minimal = basic_maximize_data[i][0];
@ -5604,7 +5605,7 @@ static void TestLikelySubtags()
}
}
for (i = 0; i < sizeof(basic_minimize_data) / sizeof(basic_minimize_data[0]); ++i) {
for (i = 0; i < UPRV_LENGTHOF(basic_minimize_data); ++i) {
UErrorCode status = U_ZERO_ERROR;
const char* const maximal = basic_minimize_data[i][0];
@ -5631,7 +5632,7 @@ static void TestLikelySubtags()
}
}
for (i = 0; i < sizeof(full_data) / sizeof(full_data[0]); ++i) {
for (i = 0; i < UPRV_LENGTHOF(full_data); ++i) {
UErrorCode status = U_ZERO_ERROR;
const char* const minimal = full_data[i][0];
@ -5657,7 +5658,7 @@ static void TestLikelySubtags()
}
}
for (i = 0; i < sizeof(full_data) / sizeof(full_data[0]); ++i) {
for (i = 0; i < UPRV_LENGTHOF(full_data); ++i) {
UErrorCode status = U_ZERO_ERROR;
const char* const maximal = full_data[i][1];
@ -5687,7 +5688,7 @@ static void TestLikelySubtags()
}
}
for (i = 0; i < sizeof(maximizeErrors) / sizeof(maximizeErrors[0]); ++i) {
for (i = 0; i < UPRV_LENGTHOF(maximizeErrors); ++i) {
UErrorCode status = U_ZERO_ERROR;
const char* const minimal = maximizeErrors[i].tag;
@ -5721,7 +5722,7 @@ static void TestLikelySubtags()
}
}
for (i = 0; i < sizeof(minimizeErrors) / sizeof(minimizeErrors[0]); ++i) {
for (i = 0; i < UPRV_LENGTHOF(minimizeErrors); ++i) {
UErrorCode status = U_ZERO_ERROR;
const char* const maximal = minimizeErrors[i].tag;

401
icu4c/source/test/cintltst/cmsccoll.c
View file

File diff suppressed because it is too large Load diff

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2014, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************
*
@ -1031,7 +1031,7 @@ static void OpenMessageFormatTest(void)
int32_t length=0;
UErrorCode status = U_ZERO_ERROR;
u_uastrncpy(pattern, PAT, sizeof(pattern)/sizeof(pattern[0]));
u_uastrncpy(pattern, PAT, UPRV_LENGTHOF(pattern));
/* Test umsg_open */
f1 = umsg_open(pattern,length,NULL,NULL,&status);
@ -1104,10 +1104,10 @@ static void MessageLength(void)
UChar result[128] = {0};
UChar expected[sizeof(expectedChars)];
u_uastrncpy(pattern, patChars, sizeof(pattern)/sizeof(pattern[0]));
u_uastrncpy(expected, expectedChars, sizeof(expected)/sizeof(expected[0]));
u_uastrncpy(pattern, patChars, UPRV_LENGTHOF(pattern));
u_uastrncpy(expected, expectedChars, UPRV_LENGTHOF(expected));
u_formatMessage("en_US", pattern, 6, result, sizeof(result)/sizeof(result[0]), &status, arg);
u_formatMessage("en_US", pattern, 6, result, UPRV_LENGTHOF(result), &status, arg);
if (U_FAILURE(status)) {
log_err("u_formatMessage method failed. Error: %s \n",u_errorName(status));
}

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

@ -71,7 +71,7 @@ static void TestPatterns(void)
const char* num[] = { "0", "0.", ".0", "0" };
log_verbose("\nTesting different format patterns\n");
pat_length = sizeof(pat) / sizeof(pat[0]);
pat_length = UPRV_LENGTHOF(pat);
for (i=0; i < pat_length; ++i)
{
status = U_ZERO_ERROR;
@ -244,9 +244,9 @@ static void TestExponential(void)
};
pat_length = sizeof(pat) / sizeof(pat[0]);
val_length = sizeof(val) / sizeof(val[0]);
lval_length = sizeof(lval) / sizeof(lval[0]);
pat_length = UPRV_LENGTHOF(pat);
val_length = UPRV_LENGTHOF(val);
lval_length = UPRV_LENGTHOF(lval);
ival = 0;
ilval = 0;
for (p=0; p < pat_length; ++p)
@ -853,7 +853,7 @@ static void TestCurrencyKeywords(void)
for(i = 0; i < noLocales; i++) {
strcpy(currLoc, uloc_getAvailable(i));
for(j = 0; j < sizeof(currencies)/sizeof(currencies[0]); j++) {
for(j = 0; j < UPRV_LENGTHOF(currencies); j++) {
strcpy(locale, currLoc);
strcat(locale, "@currency=");
strcat(locale, currencies[j]);

34
icu4c/source/test/cintltst/cnumtst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -38,8 +38,6 @@
#include <stdio.h>
#include <stdlib.h>
#define LENGTH(arr) (sizeof(arr)/sizeof(arr[0]))
static const char *tagAssert(const char *f, int32_t l, const char *msg) {
static char _fileline[1000];
sprintf(_fileline, "%s:%d: ASSERT_TRUE(%s)", f, l, msg);
@ -780,18 +778,18 @@ free(result);
if (spellout_def)
{
static const int32_t values[] = { 0, -5, 105, 1005, 105050 };
for (i = 0; i < LENGTH(values); ++i) {
for (i = 0; i < UPRV_LENGTHOF(values); ++i) {
UChar buffer[128];
int32_t len;
int32_t value = values[i];
status = U_ZERO_ERROR;
len = unum_format(spellout_def, value, buffer, LENGTH(buffer), NULL, &status);
len = unum_format(spellout_def, value, buffer, UPRV_LENGTHOF(buffer), NULL, &status);
if(U_FAILURE(status)) {
log_err("Error in formatting using unum_format(spellout_fmt, ...): %s\n", myErrorName(status));
} else {
int32_t pp = 0;
int32_t parseResult;
/*ustrToAstr(buffer, len, logbuf, LENGTH(logbuf));*/
/*ustrToAstr(buffer, len, logbuf, UPRV_LENGTHOF(logbuf));*/
log_verbose("formatted %d as '%s', length: %d\n", value, aescstrdup(buffer, len), len);
parseResult = unum_parse(spellout_def, buffer, len, &pp, &status);
@ -1241,7 +1239,7 @@ static void TestSigDigRounding()
unum_setAttribute(fmt, UNUM_ROUNDING_MODE, UNUM_ROUND_UP);
unum_setDoubleAttribute(fmt, UNUM_ROUNDING_INCREMENT, 20.0);
(void)unum_formatDouble(fmt, d, result, sizeof(result) / sizeof(result[0]), NULL, &status);
(void)unum_formatDouble(fmt, d, result, UPRV_LENGTHOF(result), NULL, &status);
if(U_FAILURE(status))
{
log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status));
@ -1504,13 +1502,13 @@ static void TestInt64Format() {
static void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
char temp[512];
UChar buffer[512];
int32_t BUFSIZE = sizeof(buffer)/sizeof(buffer[0]);
int32_t BUFSIZE = UPRV_LENGTHOF(buffer);
double vals[] = {
-.2, 0, .2, 5.5, 15.2, 250, 123456789
};
int i;
for (i = 0; i < sizeof(vals)/sizeof(vals[0]); ++i) {
for (i = 0; i < UPRV_LENGTHOF(vals); ++i) {
UErrorCode status = U_ZERO_ERROR;
unum_formatDouble(fmt, vals[i], buffer, BUFSIZE, NULL, &status);
if (U_FAILURE(status)) {
@ -1600,7 +1598,7 @@ static void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
u_austrcpy(temp, buffer);
log_err("unexpected ruleset len: %d ex: %d val: %s\n", len2, i, temp);
} else {
for (i = 0; i < sizeof(vals)/sizeof(vals[0]); ++i) {
for (i = 0; i < UPRV_LENGTHOF(vals); ++i) {
status = U_ZERO_ERROR;
unum_formatDouble(fmt, vals[i], buffer, BUFSIZE, NULL, &status);
if (U_FAILURE(status)) {
@ -1659,7 +1657,7 @@ static void TestNonExistentCurrency() {
unum_getSymbol(format,
UNUM_CURRENCY_SYMBOL,
currencySymbol,
sizeof(currencySymbol)/sizeof(currencySymbol[0]),
UPRV_LENGTHOF(currencySymbol),
&status);
if (u_strcmp(currencySymbol, QQQ) != 0) {
log_err("unum_open set the currency to QQQ\n");
@ -1674,7 +1672,7 @@ static void TestRBNFFormat() {
UChar pat[1024];
UChar tempUChars[512];
UNumberFormat *formats[5];
int COUNT = sizeof(formats)/sizeof(formats[0]);
int COUNT = UPRV_LENGTHOF(formats);
int i;
for (i = 0; i < COUNT; ++i) {
@ -1930,7 +1928,7 @@ static void TestNBSPInPattern(void) {
#define SPECIAL_PATTERN "\\u00A4\\u00A4'\\u062f.\\u0625.\\u200f\\u00a0'###0.00"
UChar pat[200];
testcase = "ar_AE special pattern: " SPECIAL_PATTERN;
u_unescape(SPECIAL_PATTERN, pat, sizeof(pat)/sizeof(pat[0]));
u_unescape(SPECIAL_PATTERN, pat, UPRV_LENGTHOF(pat));
unum_applyPattern(nf, FALSE, pat, -1, NULL, &status);
if(U_FAILURE(status)) {
log_err("%s: unum_applyPattern failed with %s\n", testcase, u_errorName(status));
@ -2440,11 +2438,11 @@ static void TestCurrencyIsoPluralFormat(void) {
int32_t i, sIndex;
for (i=0; i<LENGTH(DATA); ++i) {
for (i=0; i<UPRV_LENGTHOF(DATA); ++i) {
const char* localeString = DATA[i][0];
double numberToBeFormat = atof(DATA[i][1]);
const char* currencyISOCode = DATA[i][2];
for (sIndex = 0; sIndex < LENGTH(currencyStyles); ++sIndex) {
for (sIndex = 0; sIndex < UPRV_LENGTHOF(currencyStyles); ++sIndex) {
UNumberFormatStyle style = currencyStyles[sIndex];
UErrorCode status = U_ZERO_ERROR;
UChar currencyCode[4];
@ -2598,7 +2596,7 @@ static void TestCurrencyUsage(void) {
log_err("FAIL: currency usage attribute is not UNUM_CURRENCY_CASH\n");
}
for (j=0; j<LENGTH(DATA); ++j) {
for (j=0; j<UPRV_LENGTHOF(DATA); ++j) {
UChar expect[64];
int32_t expectLen;
UChar currencyCode[4];
@ -2607,12 +2605,12 @@ static void TestCurrencyUsage(void) {
UFieldPosition pos = {0};
u_charsToUChars(DATA[j][0], currencyCode, 3);
expectLen = u_unescape(DATA[j][1], expect, LENGTH(expect));
expectLen = u_unescape(DATA[j][1], expect, UPRV_LENGTHOF(expect));
unum_setTextAttribute(unumFmt, UNUM_CURRENCY_CODE, currencyCode, 3, &status);
assertSuccess("num_setTextAttribute()", &status);
resultLen = unum_formatDouble(unumFmt, numberToBeFormat, result, LENGTH(result),
resultLen = unum_formatDouble(unumFmt, numberToBeFormat, result, UPRV_LENGTHOF(result),
&pos, &status);
assertSuccess("num_formatDouble()", &status);

2
icu4c/source/test/cintltst/crelativedateformattest.c
View file

@ -18,8 +18,6 @@
static void TestRelDateFmt(void);
static void TestCombineDateTime(void);
#define LEN(a) (sizeof(a)/sizeof(a[0]))
void addRelativeDateFormatTest(TestNode** root);
#define TESTCASE(x) addTest(root, &x, "tsformat/crelativedateformattest/" #x)

9
icu4c/source/test/cintltst/crestst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2014, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@ -18,6 +18,7 @@
#include "unicode/utypes.h"
#include "cintltst.h"
#include "unicode/ustring.h"
#include "cmemory.h"
#include "cstring.h"
#include "filestrm.h"
#include <stdlib.h>
@ -77,7 +78,7 @@ static struct
{ "ne", U_USING_DEFAULT_WARNING, e_Root, { TRUE, FALSE, FALSE }, { TRUE, FALSE, FALSE } }
};
static int32_t bundles_count = sizeof(param) / sizeof(param[0]);
static int32_t bundles_count = UPRV_LENGTHOF(param);
@ -926,7 +927,7 @@ static void TestGetSize(void) {
return;
}
for(i = 0; i < sizeof(test)/sizeof(test[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(test); i++) {
res = ures_getByKey(rb, test[i].key, res, &status);
if(U_FAILURE(status))
{
@ -977,7 +978,7 @@ static void TestGetLocaleByType(void) {
return;
}
for(i = 0; i < sizeof(test)/sizeof(test[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(test); i++) {
rb = ures_open(testdatapath, test[i].requestedLocale, &status);
if(U_FAILURE(status))
{

21
icu4c/source/test/cintltst/creststn.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@ -22,6 +22,7 @@
#include "unicode/ustring.h"
#include "unicode/ucnv.h"
#include "string.h"
#include "cmemory.h"
#include "cstring.h"
#include "unicode/uchar.h"
#include "ucol_imp.h" /* for U_ICUDATA_COLL */
@ -170,7 +171,7 @@ param[] =
{ "ne", U_USING_DEFAULT_WARNING, e_Root, { TRUE, FALSE, FALSE }, { TRUE, FALSE, FALSE } }
};
static int32_t bundles_count = sizeof(param) / sizeof(param[0]);
static int32_t bundles_count = UPRV_LENGTHOF(param);
@ -353,7 +354,7 @@ static void TestAliasConflict(void) {
}
ures_close(he);
size = sizeof(norwayNames)/sizeof(norwayNames[0]);
size = UPRV_LENGTHOF(norwayNames);
for(i = 0; i < size; i++) {
status = U_ZERO_ERROR;
norway = ures_open(NULL, norwayNames[i], &status);
@ -1011,8 +1012,8 @@ static void TestAPI() {
}
#endif
u_memset(largeBuffer, 0x0030, sizeof(largeBuffer)/sizeof(largeBuffer[0]));
largeBuffer[sizeof(largeBuffer)/sizeof(largeBuffer[0])-1] = 0;
u_memset(largeBuffer, 0x0030, UPRV_LENGTHOF(largeBuffer));
largeBuffer[UPRV_LENGTHOF(largeBuffer)-1] = 0;
/*Test ures_openU */
@ -2294,7 +2295,7 @@ static void TestResourceLevelAliasing(void) {
if(U_FAILURE(status)) {
log_err("FAIL: Couldn't get testGetStringByKeyAliasing resource: %s\n", u_errorName(status));
} else {
for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
result = tres_getString(tb, -1, keys[i], &resultLen, &status);
if(U_FAILURE(status)){
log_err("(1) Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
@ -2305,7 +2306,7 @@ static void TestResourceLevelAliasing(void) {
log_err("(1) Didn't get correct string while accessing alias table by key (%s)\n", keys[i]);
}
}
for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
result = tres_getString(tb, i, NULL, &resultLen, &status);
if(U_FAILURE(status)){
log_err("(2) Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
@ -2316,7 +2317,7 @@ static void TestResourceLevelAliasing(void) {
log_err("(2) Didn't get correct string while accesing alias table by index (%s)\n", strings[i]);
}
}
for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
result = ures_getNextString(tb, &resultLen, &key, &status);
if(U_FAILURE(status)){
log_err("(3) Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
@ -2332,7 +2333,7 @@ static void TestResourceLevelAliasing(void) {
if(U_FAILURE(status)) {
log_err("FAIL: Couldn't get testGetStringByIndexAliasing resource: %s\n", u_errorName(status));
} else {
for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
result = tres_getString(tb, i, NULL, &resultLen, &status);
if(U_FAILURE(status)){
log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
@ -2343,7 +2344,7 @@ static void TestResourceLevelAliasing(void) {
log_err("Didn't get correct string while accesing alias by index in an array (%s)\n", strings[i]);
}
}
for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
result = ures_getNextString(tb, &resultLen, &key, &status);
if(U_FAILURE(status)){
log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@ -323,7 +323,7 @@ Checks LetterLike Symbols which were previously a source of confusion
0x1FFC,
0x1FFC,
};
int32_t num = sizeof(expected)/sizeof(expected[0]);
int32_t num = UPRV_LENGTHOF(expected);
for(i=0; i<num; i++){
if(!u_istitle(expected[i])){
log_err("u_istitle failed for 0x%4X. Expected TRUE, got FALSE\n",expected[i]);
@ -1396,7 +1396,7 @@ static void TestCodeUnit(){
int32_t i;
for(i=0; i<(int32_t)(sizeof(codeunit)/sizeof(codeunit[0])); i++){
for(i=0; i<UPRV_LENGTHOF(codeunit); i++){
UChar c=codeunit[i];
if(i<4){
if(!(UTF_IS_SINGLE(c)) || (UTF_IS_LEAD(c)) || (UTF_IS_TRAIL(c)) ||(UTF_IS_SURROGATE(c))){
@ -1448,7 +1448,7 @@ static void TestCodePoint(){
0xfffe,
};
int32_t i;
for(i=0; i<(int32_t)(sizeof(codePoint)/sizeof(codePoint[0])); i++){
for(i=0; i<UPRV_LENGTHOF(codePoint); i++){
UChar32 c=codePoint[i];
if(i<6){
if(!UTF_IS_SURROGATE(c) || !U_IS_SURROGATE(c) || !U16_IS_SURROGATE(c)){
@ -1490,7 +1490,7 @@ static void TestCodePoint(){
log_err("ERROR: isError() failed for U+%04x\n", c);
}
}
else if(i >=18 && i<(int32_t)(sizeof(codePoint)/sizeof(codePoint[0]))){
else if(i >=18 && i<UPRV_LENGTHOF(codePoint)){
if(UTF_IS_SURROGATE(c) || U_IS_SURROGATE(c) || U16_IS_SURROGATE(c)){
log_err("ERROR: isSurrogate() failed for U+%04x\n", c);
}
@ -1542,7 +1542,7 @@ static void TestCharLength()
int32_t i;
UBool multiple;
for(i=0; i<(int32_t)(sizeof(codepoint)/sizeof(codepoint[0])); i=(int16_t)(i+2)){
for(i=0; i<UPRV_LENGTHOF(codepoint); i=(int16_t)(i+2)){
UChar32 c=codepoint[i+1];
if(UTF_CHAR_LENGTH(c) != codepoint[i] || U16_LENGTH(c) != codepoint[i]){
log_err("The no: of code units for U+%04x:- Expected: %d Got: %d\n", c, codepoint[i], U16_LENGTH(c));
@ -1627,7 +1627,7 @@ enumCharNamesFn(void *context,
}
++*pCount;
for(i=0; i<sizeof(names)/sizeof(names[0]); ++i) {
for(i=0; i<UPRV_LENGTHOF(names); ++i) {
if(code==(UChar32)names[i].code) {
switch (nameChoice) {
case U_EXTENDED_CHAR_NAME:
@ -1722,7 +1722,7 @@ TestCharNames() {
/* ### TODO same tests for max ISO comment length as for max name length */
log_verbose("Testing u_charName()\n");
for(i=0; i<(int32_t)(sizeof(names)/sizeof(names[0])); ++i) {
for(i=0; i<UPRV_LENGTHOF(names); ++i) {
/* modern Unicode character name */
length=u_charName(names[i].code, U_UNICODE_CHAR_NAME, name, sizeof(name), &errorCode);
if(U_FAILURE(errorCode)) {
@ -2707,7 +2707,7 @@ TestAdditionalProperties() {
}
/* test u_charAge() */
for(i=0; i<sizeof(charAges)/sizeof(charAges[0]); ++i) {
for(i=0; i<UPRV_LENGTHOF(charAges); ++i) {
u_charAge(charAges[i].c, version);
if(0!=memcmp(version, charAges[i].version, sizeof(UVersionInfo))) {
log_err("error: u_charAge(U+%04lx)={ %u, %u, %u, %u } instead of { %u, %u, %u, %u }\n",
@ -2785,7 +2785,7 @@ TestAdditionalProperties() {
}
/* test u_hasBinaryProperty() and u_getIntPropertyValue() */
for(i=0; i<sizeof(props)/sizeof(props[0]); ++i) {
for(i=0; i<UPRV_LENGTHOF(props); ++i) {
const char *whichName;
if(props[i][0]<0) {

9
icu4c/source/test/cintltst/currtest.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2005-2015, International Business Machines Corporation and
* Copyright (c) 2005-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
#include "unicode/utypes.h"
@ -10,6 +10,7 @@
#include "unicode/ucurr.h"
#include "unicode/ustring.h"
#include "cintltst.h"
#include "cmemory.h"
#include "cstring.h"
static void expectInList(const char *isoCurrency, uint32_t currencyType, UBool isExpected) {
@ -167,21 +168,21 @@ static void TestFractionDigitOverride(void) {
return;
}
/* Make sure that you can format normal fraction digits. */
unum_formatDouble(fmt, 123.456, buffer, sizeof(buffer)/sizeof(buffer[0]), NULL, &status);
unum_formatDouble(fmt, 123.456, buffer, UPRV_LENGTHOF(buffer), NULL, &status);
u_unescape(expectedFirst, expectedBuf, strlen(expectedFirst)+1);
if (u_strcmp(buffer, expectedBuf) != 0) {
log_err("Error: unum_formatDouble didn't return %s\n", expectedFirst);
}
/* Make sure that you can format 2 fraction digits. */
unum_setAttribute(fmt, UNUM_FRACTION_DIGITS, 2);
unum_formatDouble(fmt, 123.456, buffer, sizeof(buffer)/sizeof(buffer[0]), NULL, &status);
unum_formatDouble(fmt, 123.456, buffer, UPRV_LENGTHOF(buffer), NULL, &status);
u_unescape(expectedSecond, expectedBuf, strlen(expectedSecond)+1);
if (u_strcmp(buffer, expectedBuf) != 0) {
log_err("Error: unum_formatDouble didn't return %s\n", expectedSecond);
}
/* Make sure that you can format more fraction digits. */
unum_setAttribute(fmt, UNUM_FRACTION_DIGITS, 3);
unum_formatDouble(fmt, 123.456, buffer, sizeof(buffer)/sizeof(buffer[0]), NULL, &status);
unum_formatDouble(fmt, 123.456, buffer, UPRV_LENGTHOF(buffer), NULL, &status);
u_unescape(expectedThird, expectedBuf, strlen(expectedThird)+1);
if (u_strcmp(buffer, expectedBuf) != 0) {
log_err("Error: unum_formatDouble didn't return %s\n", expectedThird);

8
icu4c/source/test/cintltst/custrtrn.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2001-2014, International Business Machines Corporation and
* Copyright (c) 2001-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -1390,15 +1390,15 @@ static void Test_widestrs()
#if (defined(U_WCHAR_IS_UTF16) || defined(U_WCHAR_IS_UTF32)) || (!UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION)
wchar_t ws[100];
UChar rts[100];
int32_t wcap = sizeof(ws) / sizeof(*ws);
int32_t wcap = UPRV_LENGTHOF(ws);
int32_t wl;
int32_t rtcap = sizeof(rts) / sizeof(*rts);
int32_t rtcap = UPRV_LENGTHOF(rts);
int32_t rtl;
wchar_t *wcs;
UChar *cp;
const char *errname;
UChar ustr[] = {'h', 'e', 'l', 'l', 'o', 0};
int32_t ul = sizeof(ustr)/sizeof(*ustr) -1;
int32_t ul = UPRV_LENGTHOF(ustr) -1;
char astr[100];
UErrorCode err;

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

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2002-2015, International Business Machines
* Copyright (C) 2002-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -362,7 +362,7 @@ static void TestStringFunctions()
currToken++;
}
if (currToken != sizeof(tokens)/sizeof(tokens[0])) {
if (currToken != UPRV_LENGTHOF(tokens)) {
log_err("Didn't get correct number of tokens\n");
}
state = delimBuf; /* Give it an "invalid" saveState */
@ -426,7 +426,7 @@ static void TestStringFunctions()
UCharIterator iter1, iter2;
int32_t len1, len2, r1, r2;
for(i=0; i<(sizeof(strings)/sizeof(strings[0])-1); ++i) {
for(i=0; i<(UPRV_LENGTHOF(strings)-1); ++i) {
if(u_strcmpCodePointOrder(strings[i], strings[i+1])>=0) {
log_err("error: u_strcmpCodePointOrder() fails for string %d and the following one\n", i);
}
@ -1093,18 +1093,18 @@ TestUnescape() {
0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x20,
0x5a, 0x65, 0x69, 0x63, 0x68, 0x65, 0x6e, 0x3a, 0x20, 0xdbc8, 0xdf45, 0x1b, 0x03, 0x0a, 0x20, 0x1b, 0x263A, 0
};
static const int32_t explength = sizeof(expect)/sizeof(expect[0])-1;
static const int32_t explength = UPRV_LENGTHOF(expect)-1;
int32_t length;
/* test u_unescape() */
length=u_unescape(input, buffer, sizeof(buffer)/sizeof(buffer[0]));
length=u_unescape(input, buffer, UPRV_LENGTHOF(buffer));
if(length!=explength || u_strcmp(buffer, expect)!=0) {
log_err("failure in u_unescape(): length %d!=%d and/or incorrect result string\n", length,
explength);
}
/* try preflighting */
length=u_unescape(input, NULL, sizeof(buffer)/sizeof(buffer[0]));
length=u_unescape(input, NULL, UPRV_LENGTHOF(buffer));
if(length!=explength || u_strcmp(buffer, expect)!=0) {
log_err("failure in u_unescape(preflighting): length %d!=%d\n", length, explength);
}

7
icu4c/source/test/cintltst/encoll.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2009, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -31,6 +31,7 @@
#include "encoll.h"
#include "ccolltst.h"
#include "callcoll.h"
#include "cmemory.h"
#include "unicode/ustring.h"
static UCollator *myCollation = NULL;
@ -288,7 +289,7 @@ static void TestTertiary( )
}
}
/*test more interesting cases */
testMoreSize = sizeof(testMore) / sizeof(testMore[0]);
testMoreSize = UPRV_LENGTHOF(testMore);
for (i = 0; i < testMoreSize; i++)
{
for (j = 0; j < testMoreSize; j++)
@ -340,7 +341,7 @@ static void TestSecondary()
/*test acute and grave ordering (compare to french collation) */
testAcuteSize = sizeof(testAcute) / sizeof(testAcute[0]);
testAcuteSize = UPRV_LENGTHOF(testAcute);
for (i = 0; i < testAcuteSize; i++)
{
for (j = 0; j < testAcuteSize; j++)

16
icu4c/source/test/cintltst/idnatest.c
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2014, International Business Machines
* Copyright (C) 2003-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -430,7 +430,7 @@ TestToASCII(){
UChar buf[MAX_DEST_SIZE];
const char* testName = "uidna_toASCII";
TestFunc func = uidna_toASCII;
for(i=0;i< (int32_t)(sizeof(unicodeIn)/sizeof(unicodeIn[0])); i++){
for(i=0;i< UPRV_LENGTHOF(unicodeIn); i++){
u_charsToUChars(asciiIn[i],buf, (int32_t)strlen(asciiIn[i])+1);
testAPI(unicodeIn[i], buf,testName, FALSE,U_ZERO_ERROR, TRUE, TRUE, func);
@ -444,7 +444,7 @@ TestToUnicode(){
UChar buf[MAX_DEST_SIZE];
const char* testName = "uidna_toUnicode";
TestFunc func = uidna_toUnicode;
for(i=0;i< (int32_t)(sizeof(asciiIn)/sizeof(asciiIn[0])); i++){
for(i=0;i< UPRV_LENGTHOF(asciiIn); i++){
u_charsToUChars(asciiIn[i],buf, (int32_t)strlen(asciiIn[i])+1);
testAPI(buf,unicodeIn[i],testName,FALSE,U_ZERO_ERROR, TRUE, TRUE, func);
}
@ -461,7 +461,7 @@ TestIDNToUnicode(){
UParseError parseError;
const char* testName="uidna_IDNToUnicode";
TestFunc func = uidna_IDNToUnicode;
for(i=0;i< (int32_t)(sizeof(domainNames)/sizeof(domainNames[0])); i++){
for(i=0;i< UPRV_LENGTHOF(domainNames); i++){
bufLen = (int32_t)strlen(domainNames[i]);
bufLen = u_unescape(domainNames[i],buf, bufLen+1);
func(buf,bufLen,expected,MAX_DEST_SIZE, UIDNA_ALLOW_UNASSIGNED, &parseError,&status);
@ -491,7 +491,7 @@ TestIDNToASCII(){
const char* testName="udina_IDNToASCII";
TestFunc func=uidna_IDNToASCII;
for(i=0;i< (int32_t)(sizeof(domainNames)/sizeof(domainNames[0])); i++){
for(i=0;i< UPRV_LENGTHOF(domainNames); i++){
bufLen = (int32_t)strlen(domainNames[i]);
bufLen = u_unescape(domainNames[i],buf, bufLen+1);
func(buf,bufLen,expected,MAX_DEST_SIZE, UIDNA_ALLOW_UNASSIGNED, &parseError,&status);
@ -597,7 +597,7 @@ TestCompare(){
/* prepend www. */
u_strcat(source, www);
for(i=0;i< (int32_t)(sizeof(unicodeIn)/sizeof(unicodeIn[0])); i++){
for(i=0;i< UPRV_LENGTHOF(unicodeIn); i++){
UChar* src;
int32_t srcLen;
@ -646,7 +646,7 @@ static void TestJB4490(){
UChar output1[40] = {0};
UChar output2[40] = {0};
int32_t i;
for(i=0; i< sizeof(data)/sizeof(data[0]); i++){
for(i=0; i< UPRV_LENGTHOF(data); i++){
const UChar* src1 = data[i];
int32_t src1Len = u_strlen(src1);
UChar* dest1 = output1;
@ -678,7 +678,7 @@ static void TestJB4475(){
};
int i;
UChar output[40] = {0};
for(i=0; i< sizeof(input)/sizeof(input[0]); i++){
for(i=0; i< UPRV_LENGTHOF(input); i++){
const UChar* src = input[i];
int32_t srcLen = u_strlen(src);
UChar* dest = output;

270
icu4c/source/test/cintltst/nccbtst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2013, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*
@ -16,6 +16,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include "cmemory.h"
#include "cstring.h"
#include "unicode/uloc.h"
#include "unicode/ucnv.h"
@ -30,7 +31,6 @@
#define NEW_MAX_BUFFER 999
#define nct_min(x,y) ((x<y) ? x : y)
#define ARRAY_LENGTH(array) (sizeof(array)/sizeof((array)[0]))
static int32_t gInBufferSize = 0;
static int32_t gOutBufferSize = 0;
@ -183,11 +183,11 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
static const int32_t toIBM949Offsskip [] = { 0, 1, 1, 2, 2, 4, 4 };
static const int32_t toIBM943Offsskip [] = { 0, 0, 1, 1, 3, 3 };
if(!testConvertFromUnicode(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromUnicode(sampleText, UPRV_LENGTHOF(sampleText),
expskipIBM_949, sizeof(expskipIBM_949), "ibm-949",
UCNV_FROM_U_CALLBACK_SKIP, toIBM949Offsskip, NULL, 0 ))
log_err("u-> ibm-949 with skip did not match.\n");
if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!testConvertFromUnicode(sampleText2, UPRV_LENGTHOF(sampleText2),
expskipIBM_943, sizeof(expskipIBM_943), "ibm-943",
UCNV_FROM_U_CALLBACK_SKIP, toIBM943Offsskip, NULL, 0 ))
log_err("u-> ibm-943 with skip did not match.\n");
@ -420,81 +420,81 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
};
static const int32_t from_isciiOffs1 [] ={0,2};
if(!testConvertFromUnicode(inputTest, sizeof(inputTest)/sizeof(inputTest[0]),
if(!testConvertFromUnicode(inputTest, UPRV_LENGTHOF(inputTest),
toIBM943, sizeof(toIBM943), "ibm-943",
UCNV_FROM_U_CALLBACK_SKIP, offset, NULL, 0 ))
log_err("u-> ibm-943 with skip did not match.\n");
if(!testConvertFromUnicode(euc_jp_inputText, sizeof(euc_jp_inputText)/sizeof(euc_jp_inputText[0]),
if(!testConvertFromUnicode(euc_jp_inputText, UPRV_LENGTHOF(euc_jp_inputText),
to_euc_jp, sizeof(to_euc_jp), "IBM-eucJP",
UCNV_FROM_U_CALLBACK_SKIP, fromEUC_JPOffs, NULL, 0 ))
log_err("u-> euc-jp with skip did not match.\n");
if(!testConvertFromUnicode(euc_tw_inputText, sizeof(euc_tw_inputText)/sizeof(euc_tw_inputText[0]),
if(!testConvertFromUnicode(euc_tw_inputText, UPRV_LENGTHOF(euc_tw_inputText),
to_euc_tw, sizeof(to_euc_tw), "euc-tw",
UCNV_FROM_U_CALLBACK_SKIP, from_euc_twOffs, NULL, 0 ))
log_err("u-> euc-tw with skip did not match.\n");
/*iso_2022_jp*/
if(!testConvertFromUnicode(iso_2022_jp_inputText, sizeof(iso_2022_jp_inputText)/sizeof(iso_2022_jp_inputText[0]),
if(!testConvertFromUnicode(iso_2022_jp_inputText, UPRV_LENGTHOF(iso_2022_jp_inputText),
to_iso_2022_jp, sizeof(to_iso_2022_jp), "iso-2022-jp",
UCNV_FROM_U_CALLBACK_SKIP, from_iso_2022_jpOffs, NULL, 0 ))
log_err("u-> iso-2022-jp with skip did not match.\n");
/* with context */
if(!testConvertFromUnicodeWithContext(iso_2022_jp_inputText2, sizeof(iso_2022_jp_inputText2)/sizeof(iso_2022_jp_inputText2[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_jp_inputText2, UPRV_LENGTHOF(iso_2022_jp_inputText2),
to_iso_2022_jp2, sizeof(to_iso_2022_jp2), "iso-2022-jp",
UCNV_FROM_U_CALLBACK_SKIP, from_iso_2022_jpOffs2, NULL, 0,UCNV_SKIP_STOP_ON_ILLEGAL,U_ILLEGAL_CHAR_FOUND ))
log_err("u-> iso-2022-jp with skip & UCNV_SKIP_STOP_ON_ILLEGAL did not match.\n");
/*iso_2022_cn*/
if(!testConvertFromUnicode(iso_2022_cn_inputText, sizeof(iso_2022_cn_inputText)/sizeof(iso_2022_cn_inputText[0]),
if(!testConvertFromUnicode(iso_2022_cn_inputText, UPRV_LENGTHOF(iso_2022_cn_inputText),
to_iso_2022_cn, sizeof(to_iso_2022_cn), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_SKIP, from_iso_2022_cnOffs, NULL, 0 ))
log_err("u-> iso-2022-cn with skip did not match.\n");
/*with context*/
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText1, sizeof(iso_2022_cn_inputText1)/sizeof(iso_2022_cn_inputText1[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText1, UPRV_LENGTHOF(iso_2022_cn_inputText1),
to_iso_2022_cn1, sizeof(to_iso_2022_cn1), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_SKIP, from_iso_2022_cnOffs1, NULL, 0,UCNV_SKIP_STOP_ON_ILLEGAL,U_ILLEGAL_CHAR_FOUND ))
log_err("u-> iso-2022-cn with skip & UCNV_SKIP_STOP_ON_ILLEGAL did not match.\n");
/*iso_2022_kr*/
if(!testConvertFromUnicode(iso_2022_kr_inputText, sizeof(iso_2022_kr_inputText)/sizeof(iso_2022_kr_inputText[0]),
if(!testConvertFromUnicode(iso_2022_kr_inputText, UPRV_LENGTHOF(iso_2022_kr_inputText),
to_iso_2022_kr, sizeof(to_iso_2022_kr), "iso-2022-kr",
UCNV_FROM_U_CALLBACK_SKIP, from_iso_2022_krOffs, NULL, 0 ))
log_err("u-> iso-2022-kr with skip did not match.\n");
/*with context*/
if(!testConvertFromUnicodeWithContext(iso_2022_kr_inputText1, sizeof(iso_2022_kr_inputText1)/sizeof(iso_2022_kr_inputText1[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_kr_inputText1, UPRV_LENGTHOF(iso_2022_kr_inputText1),
to_iso_2022_kr1, sizeof(to_iso_2022_kr1), "iso-2022-kr",
UCNV_FROM_U_CALLBACK_SKIP, from_iso_2022_krOffs1, NULL, 0,UCNV_SKIP_STOP_ON_ILLEGAL,U_ILLEGAL_CHAR_FOUND ))
log_err("u-> iso-2022-kr with skip & UCNV_SKIP_STOP_ON_ILLEGAL did not match.\n");
/*hz*/
if(!testConvertFromUnicode(hz_inputText, sizeof(hz_inputText)/sizeof(hz_inputText[0]),
if(!testConvertFromUnicode(hz_inputText, UPRV_LENGTHOF(hz_inputText),
to_hz, sizeof(to_hz), "HZ",
UCNV_FROM_U_CALLBACK_SKIP, from_hzOffs, NULL, 0 ))
log_err("u-> HZ with skip did not match.\n");
/*with context*/
if(!testConvertFromUnicodeWithContext(hz_inputText1, sizeof(hz_inputText1)/sizeof(hz_inputText1[0]),
if(!testConvertFromUnicodeWithContext(hz_inputText1, UPRV_LENGTHOF(hz_inputText1),
to_hz1, sizeof(to_hz1), "hz",
UCNV_FROM_U_CALLBACK_SKIP, from_hzOffs1, NULL, 0,UCNV_SKIP_STOP_ON_ILLEGAL,U_ILLEGAL_CHAR_FOUND ))
log_err("u-> hz with skip & UCNV_SKIP_STOP_ON_ILLEGAL did not match.\n");
#endif
/*SCSU*/
if(!testConvertFromUnicode(SCSU_inputText, sizeof(SCSU_inputText)/sizeof(SCSU_inputText[0]),
if(!testConvertFromUnicode(SCSU_inputText, UPRV_LENGTHOF(SCSU_inputText),
to_SCSU, sizeof(to_SCSU), "SCSU",
UCNV_FROM_U_CALLBACK_SKIP, from_SCSUOffs, NULL, 0 ))
log_err("u-> SCSU with skip did not match.\n");
#if !UCONFIG_NO_LEGACY_CONVERSION
/*ISCII*/
if(!testConvertFromUnicode(iscii_inputText, sizeof(iscii_inputText)/sizeof(iscii_inputText[0]),
if(!testConvertFromUnicode(iscii_inputText, UPRV_LENGTHOF(iscii_inputText),
to_iscii, sizeof(to_iscii), "ISCII,version=0",
UCNV_FROM_U_CALLBACK_SKIP, from_isciiOffs, NULL, 0 ))
log_err("u-> iscii with skip did not match.\n");
/*with context*/
if(!testConvertFromUnicodeWithContext(iscii_inputText1, sizeof(iscii_inputText1)/sizeof(iscii_inputText1[0]),
if(!testConvertFromUnicodeWithContext(iscii_inputText1, UPRV_LENGTHOF(iscii_inputText1),
to_iscii1, sizeof(to_iscii1), "ISCII,version=0",
UCNV_FROM_U_CALLBACK_SKIP, from_isciiOffs1, NULL, 0,UCNV_SKIP_STOP_ON_ILLEGAL,U_ILLEGAL_CHAR_FOUND ))
log_err("u-> iscii with skip & UCNV_SKIP_STOP_ON_ILLEGAL did not match.\n");
@ -580,7 +580,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
};
/* BOCU-1 fromUnicode never calls callbacks, so this only tests single-byte and offsets behavior */
if(!testConvertFromUnicode(expected, ARRAY_LENGTH(expected),
if(!testConvertFromUnicode(expected, UPRV_LENGTHOF(expected),
sampleText, sizeof(sampleText),
"BOCU-1",
UCNV_FROM_U_CALLBACK_SKIP, offsets, NULL, 0)
@ -628,7 +628,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
/* CESU-8 fromUnicode never calls callbacks, so this only tests conversion and offsets behavior */
/* without offsets */
if(!testConvertFromUnicode(expected, ARRAY_LENGTH(expected),
if(!testConvertFromUnicode(expected, UPRV_LENGTHOF(expected),
sampleText, sizeof(sampleText),
"CESU-8",
UCNV_FROM_U_CALLBACK_SKIP, NULL, NULL, 0)
@ -637,7 +637,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
}
/* with offsets */
if(!testConvertFromUnicode(expected, ARRAY_LENGTH(expected),
if(!testConvertFromUnicode(expected, UPRV_LENGTHOF(expected),
sampleText, sizeof(sampleText),
"CESU-8",
UCNV_FROM_U_CALLBACK_SKIP, offsets, NULL, 0)
@ -665,19 +665,19 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
UCNV_TO_U_CALLBACK_SKIP, fromIBM949Offs, NULL, 0 ))
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",
IBM_943skiptoUnicode, UPRV_LENGTHOF(IBM_943skiptoUnicode),"ibm-943",
UCNV_TO_U_CALLBACK_SKIP, fromIBM943Offs, NULL, 0 ))
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",
IBM_930skiptoUnicode, UPRV_LENGTHOF(IBM_930skiptoUnicode),"ibm-930",
UCNV_TO_U_CALLBACK_SKIP, fromIBM930Offs, NULL, 0 ))
log_err("ibm-930->u with skip did not match.\n");
if(!testConvertToUnicodeWithContext(expskipIBM_930, sizeof(expskipIBM_930),
IBM_930skiptoUnicode, sizeof(IBM_930skiptoUnicode)/sizeof(IBM_930skiptoUnicode[0]),"ibm-930",
IBM_930skiptoUnicode, UPRV_LENGTHOF(IBM_930skiptoUnicode),"ibm-930",
UCNV_TO_U_CALLBACK_SKIP, fromIBM930Offs, NULL, 0,"i",U_ILLEGAL_CHAR_FOUND ))
log_err("ibm-930->u with skip did not match.\n");
}
@ -847,55 +847,55 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
static const int32_t fromLMBCS[] = {0, 6};
if(!testConvertToUnicode(sampleTxtEBCIDIC_STATEFUL, sizeof(sampleTxtEBCIDIC_STATEFUL),
EBCIDIC_STATEFUL_toUnicode, sizeof(EBCIDIC_STATEFUL_toUnicode)/sizeof(EBCIDIC_STATEFUL_toUnicode[0]),"ibm-930",
EBCIDIC_STATEFUL_toUnicode, UPRV_LENGTHOF(EBCIDIC_STATEFUL_toUnicode),"ibm-930",
UCNV_TO_U_CALLBACK_SKIP, from_EBCIDIC_STATEFULOffsets, NULL, 0 ))
log_err("EBCIDIC_STATEFUL->u with skip did not match.\n");
if(!testConvertToUnicodeWithContext(sampleTxtEBCIDIC_STATEFUL, sizeof(sampleTxtEBCIDIC_STATEFUL),
EBCIDIC_STATEFUL_toUnicode, sizeof(EBCIDIC_STATEFUL_toUnicode)/sizeof(EBCIDIC_STATEFUL_toUnicode[0]),"ibm-930",
EBCIDIC_STATEFUL_toUnicode, UPRV_LENGTHOF(EBCIDIC_STATEFUL_toUnicode),"ibm-930",
UCNV_TO_U_CALLBACK_SKIP, from_EBCIDIC_STATEFULOffsets, NULL, 0,"i",U_ILLEGAL_CHAR_FOUND ))
log_err("EBCIDIC_STATEFUL->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_jp, sizeof(sampleTxt_euc_jp),
euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"IBM-eucJP",
euc_jptoUnicode, UPRV_LENGTHOF(euc_jptoUnicode),"IBM-eucJP",
UCNV_TO_U_CALLBACK_SKIP, from_euc_jpOffs , NULL, 0))
log_err("euc-jp->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_tw, sizeof(sampleTxt_euc_tw),
euc_twtoUnicode, sizeof(euc_twtoUnicode)/sizeof(euc_twtoUnicode[0]),"euc-tw",
euc_twtoUnicode, UPRV_LENGTHOF(euc_twtoUnicode),"euc-tw",
UCNV_TO_U_CALLBACK_SKIP, from_euc_twOffs , NULL, 0))
log_err("euc-tw->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxt_iso_2022_jp, sizeof(sampleTxt_iso_2022_jp),
iso_2022_jptoUnicode, sizeof(iso_2022_jptoUnicode)/sizeof(iso_2022_jptoUnicode[0]),"iso-2022-jp",
iso_2022_jptoUnicode, UPRV_LENGTHOF(iso_2022_jptoUnicode),"iso-2022-jp",
UCNV_TO_U_CALLBACK_SKIP, from_iso_2022_jpOffs , NULL, 0))
log_err("iso-2022-jp->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxt_iso_2022_cn, sizeof(sampleTxt_iso_2022_cn),
iso_2022_cntoUnicode, sizeof(iso_2022_cntoUnicode)/sizeof(iso_2022_cntoUnicode[0]),"iso-2022-cn",
iso_2022_cntoUnicode, UPRV_LENGTHOF(iso_2022_cntoUnicode),"iso-2022-cn",
UCNV_TO_U_CALLBACK_SKIP, from_iso_2022_cnOffs , NULL, 0))
log_err("iso-2022-cn->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxt_iso_2022_kr, sizeof(sampleTxt_iso_2022_kr),
iso_2022_krtoUnicode, sizeof(iso_2022_krtoUnicode)/sizeof(iso_2022_krtoUnicode[0]),"iso-2022-kr",
iso_2022_krtoUnicode, UPRV_LENGTHOF(iso_2022_krtoUnicode),"iso-2022-kr",
UCNV_TO_U_CALLBACK_SKIP, from_iso_2022_krOffs , NULL, 0))
log_err("iso-2022-kr->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxt_hz, sizeof(sampleTxt_hz),
hztoUnicode, sizeof(hztoUnicode)/sizeof(hztoUnicode[0]),"HZ",
hztoUnicode, UPRV_LENGTHOF(hztoUnicode),"HZ",
UCNV_TO_U_CALLBACK_SKIP, from_hzOffs , NULL, 0))
log_err("HZ->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxt_iscii, sizeof(sampleTxt_iscii),
isciitoUnicode, sizeof(isciitoUnicode)/sizeof(isciitoUnicode[0]),"ISCII,version=0",
isciitoUnicode, UPRV_LENGTHOF(isciitoUnicode),"ISCII,version=0",
UCNV_TO_U_CALLBACK_SKIP, from_isciiOffs , NULL, 0))
log_err("iscii->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxtLMBCS, sizeof(sampleTxtLMBCS),
LMBCSToUnicode, sizeof(LMBCSToUnicode)/sizeof(LMBCSToUnicode[0]),"LMBCS-1",
LMBCSToUnicode, UPRV_LENGTHOF(LMBCSToUnicode),"LMBCS-1",
UCNV_TO_U_CALLBACK_SKIP, fromLMBCS , NULL, 0))
log_err("LMBCS->u with skip did not match.\n");
@ -910,7 +910,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
int32_t offsets1[] = { 0x0000, 0x0001, 0x0006};
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8",
expected1, UPRV_LENGTHOF(expected1),"utf8",
UCNV_TO_U_CALLBACK_SKIP, offsets1, NULL, 0 ))
log_err("utf8->u with skip did not match.\n");;
}
@ -922,7 +922,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
int32_t offsets1[] = { 0x0000, 0x0001,0x0002,0x0003,4,5};
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"SCSU",
expected1, UPRV_LENGTHOF(expected1),"SCSU",
UCNV_TO_U_CALLBACK_SKIP, offsets1, NULL, 0 ))
log_err("scsu->u with skip did not match.\n");
}
@ -1003,7 +1003,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
};
if(!testConvertToUnicode(sampleText, sizeof(sampleText),
expected, ARRAY_LENGTH(expected), "BOCU-1",
expected, UPRV_LENGTHOF(expected), "BOCU-1",
UCNV_TO_U_CALLBACK_SKIP, offsets, NULL, 0)
) {
log_err("BOCU-1->u with skip did not match.\n");
@ -1056,7 +1056,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
/* without offsets */
if(!testConvertToUnicode(sampleText, sizeof(sampleText),
expected, ARRAY_LENGTH(expected), "CESU-8",
expected, UPRV_LENGTHOF(expected), "CESU-8",
UCNV_TO_U_CALLBACK_SKIP, NULL, NULL, 0)
) {
log_err("CESU-8->u with skip did not match.\n");
@ -1064,7 +1064,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
/* with offsets */
if(!testConvertToUnicode(sampleText, sizeof(sampleText),
expected, ARRAY_LENGTH(expected), "CESU-8",
expected, UPRV_LENGTHOF(expected), "CESU-8",
UCNV_TO_U_CALLBACK_SKIP, offsets, NULL, 0)
) {
log_err("CESU-8->u with skip did not match.\n");
@ -1105,15 +1105,15 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
/*From Unicode*/
#if !UCONFIG_NO_LEGACY_CONVERSION
if(!testConvertFromUnicode(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromUnicode(sampleText, UPRV_LENGTHOF(sampleText),
expstopIBM_949, sizeof(expstopIBM_949), "ibm-949",
UCNV_FROM_U_CALLBACK_STOP, toIBM949Offsstop, NULL, 0 ))
log_err("u-> ibm-949 with stop did not match.\n");
if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!testConvertFromUnicode(sampleText2, UPRV_LENGTHOF(sampleText2),
expstopIBM_943, sizeof(expstopIBM_943), "ibm-943",
UCNV_FROM_U_CALLBACK_STOP, toIBM943Offsstop , NULL, 0))
log_err("u-> ibm-943 with stop did not match.\n");
if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!testConvertFromUnicode(sampleText2, UPRV_LENGTHOF(sampleText2),
expstopIBM_930, sizeof(expstopIBM_930), "ibm-930",
UCNV_FROM_U_CALLBACK_STOP, toIBM930Offsstop, NULL, 0 ))
log_err("u-> ibm-930 with stop did not match.\n");
@ -1189,47 +1189,47 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
0,
};
if(!testConvertFromUnicode(inputTest, sizeof(inputTest)/sizeof(inputTest[0]),
if(!testConvertFromUnicode(inputTest, UPRV_LENGTHOF(inputTest),
toIBM943, sizeof(toIBM943), "ibm-943",
UCNV_FROM_U_CALLBACK_STOP, offset, NULL, 0 ))
log_err("u-> ibm-943 with stop did not match.\n");
if(!testConvertFromUnicode(euc_jp_inputText, sizeof(euc_jp_inputText)/sizeof(euc_jp_inputText[0]),
if(!testConvertFromUnicode(euc_jp_inputText, UPRV_LENGTHOF(euc_jp_inputText),
to_euc_jp, sizeof(to_euc_jp), "IBM-eucJP",
UCNV_FROM_U_CALLBACK_STOP, fromEUC_JPOffs, NULL, 0 ))
log_err("u-> euc-jp with stop did not match.\n");
if(!testConvertFromUnicode(euc_tw_inputText, sizeof(euc_tw_inputText)/sizeof(euc_tw_inputText[0]),
if(!testConvertFromUnicode(euc_tw_inputText, UPRV_LENGTHOF(euc_tw_inputText),
to_euc_tw, sizeof(to_euc_tw), "euc-tw",
UCNV_FROM_U_CALLBACK_STOP, from_euc_twOffs, NULL, 0 ))
log_err("u-> euc-tw with stop did not match.\n");
if(!testConvertFromUnicode(iso_2022_jp_inputText, sizeof(iso_2022_jp_inputText)/sizeof(iso_2022_jp_inputText[0]),
if(!testConvertFromUnicode(iso_2022_jp_inputText, UPRV_LENGTHOF(iso_2022_jp_inputText),
to_iso_2022_jp, sizeof(to_iso_2022_jp), "iso-2022-jp",
UCNV_FROM_U_CALLBACK_STOP, from_iso_2022_jpOffs, NULL, 0 ))
log_err("u-> iso-2022-jp with stop did not match.\n");
if(!testConvertFromUnicode(iso_2022_jp_inputText, sizeof(iso_2022_jp_inputText)/sizeof(iso_2022_jp_inputText[0]),
if(!testConvertFromUnicode(iso_2022_jp_inputText, UPRV_LENGTHOF(iso_2022_jp_inputText),
to_iso_2022_jp, sizeof(to_iso_2022_jp), "iso-2022-jp",
UCNV_FROM_U_CALLBACK_STOP, from_iso_2022_jpOffs, NULL, 0 ))
log_err("u-> iso-2022-jp with stop did not match.\n");
if(!testConvertFromUnicode(iso_2022_cn_inputText, sizeof(iso_2022_cn_inputText)/sizeof(iso_2022_cn_inputText[0]),
if(!testConvertFromUnicode(iso_2022_cn_inputText, UPRV_LENGTHOF(iso_2022_cn_inputText),
to_iso_2022_cn, sizeof(to_iso_2022_cn), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_STOP, from_iso_2022_cnOffs, NULL, 0 ))
log_err("u-> iso-2022-cn with stop did not match.\n");
if(!testConvertFromUnicode(iso_2022_kr_inputText, sizeof(iso_2022_kr_inputText)/sizeof(iso_2022_kr_inputText[0]),
if(!testConvertFromUnicode(iso_2022_kr_inputText, UPRV_LENGTHOF(iso_2022_kr_inputText),
to_iso_2022_kr, sizeof(to_iso_2022_kr), "iso-2022-kr",
UCNV_FROM_U_CALLBACK_STOP, from_iso_2022_krOffs, NULL, 0 ))
log_err("u-> iso-2022-kr with stop did not match.\n");
if(!testConvertFromUnicode(hz_inputText, sizeof(hz_inputText)/sizeof(hz_inputText[0]),
if(!testConvertFromUnicode(hz_inputText, UPRV_LENGTHOF(hz_inputText),
to_hz, sizeof(to_hz), "HZ",
UCNV_FROM_U_CALLBACK_STOP, from_hzOffs, NULL, 0 ))
log_err("u-> HZ with stop did not match.\n");\
if(!testConvertFromUnicode(iscii_inputText, sizeof(iscii_inputText)/sizeof(iscii_inputText[0]),
if(!testConvertFromUnicode(iscii_inputText, UPRV_LENGTHOF(iscii_inputText),
to_iscii, sizeof(to_iscii), "ISCII,version=0",
UCNV_FROM_U_CALLBACK_STOP, from_isciiOffs, NULL, 0 ))
log_err("u-> iscii with stop did not match.\n");
@ -1250,7 +1250,7 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
0,
};
if(!testConvertFromUnicode(SCSU_inputText, sizeof(SCSU_inputText)/sizeof(SCSU_inputText[0]),
if(!testConvertFromUnicode(SCSU_inputText, UPRV_LENGTHOF(SCSU_inputText),
to_SCSU, sizeof(to_SCSU), "SCSU",
UCNV_FROM_U_CALLBACK_STOP, from_SCSUOffs, NULL, 0 ))
log_err("u-> SCSU with skip did not match.\n");
@ -1261,15 +1261,15 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
#if !UCONFIG_NO_LEGACY_CONVERSION
if(!testConvertToUnicode(expstopIBM_949, sizeof(expstopIBM_949),
IBM_949stoptoUnicode, sizeof(IBM_949stoptoUnicode)/sizeof(IBM_949stoptoUnicode[0]),"ibm-949",
IBM_949stoptoUnicode, UPRV_LENGTHOF(IBM_949stoptoUnicode),"ibm-949",
UCNV_TO_U_CALLBACK_STOP, fromIBM949Offs, NULL, 0 ))
log_err("ibm-949->u with stop did not match.\n");
if(!testConvertToUnicode(expstopIBM_943, sizeof(expstopIBM_943),
IBM_943stoptoUnicode, sizeof(IBM_943stoptoUnicode)/sizeof(IBM_943stoptoUnicode[0]),"ibm-943",
IBM_943stoptoUnicode, UPRV_LENGTHOF(IBM_943stoptoUnicode),"ibm-943",
UCNV_TO_U_CALLBACK_STOP, fromIBM943Offs, NULL, 0 ))
log_err("ibm-943->u with stop did not match.\n");
if(!testConvertToUnicode(expstopIBM_930, sizeof(expstopIBM_930),
IBM_930stoptoUnicode, sizeof(IBM_930stoptoUnicode)/sizeof(IBM_930stoptoUnicode[0]),"ibm-930",
IBM_930stoptoUnicode, UPRV_LENGTHOF(IBM_930stoptoUnicode),"ibm-930",
UCNV_TO_U_CALLBACK_STOP, fromIBM930Offs, NULL, 0 ))
log_err("ibm-930->u with stop did not match.\n");
@ -1302,17 +1302,17 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleTxtEBCIDIC_STATEFUL, sizeof(sampleTxtEBCIDIC_STATEFUL),
EBCIDIC_STATEFUL_toUnicode, sizeof(EBCIDIC_STATEFUL_toUnicode)/sizeof(EBCIDIC_STATEFUL_toUnicode[0]),"ibm-930",
EBCIDIC_STATEFUL_toUnicode, UPRV_LENGTHOF(EBCIDIC_STATEFUL_toUnicode),"ibm-930",
UCNV_TO_U_CALLBACK_STOP, from_EBCIDIC_STATEFULOffsets, NULL, 0 ))
log_err("EBCIDIC_STATEFUL->u with stop did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_jp, sizeof(sampleTxt_euc_jp),
euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"IBM-eucJP",
euc_jptoUnicode, UPRV_LENGTHOF(euc_jptoUnicode),"IBM-eucJP",
UCNV_TO_U_CALLBACK_STOP, from_euc_jpOffs , NULL, 0))
log_err("euc-jp->u with stop did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_tw, sizeof(sampleTxt_euc_tw),
euc_twtoUnicode, sizeof(euc_twtoUnicode)/sizeof(euc_twtoUnicode[0]),"euc-tw",
euc_twtoUnicode, UPRV_LENGTHOF(euc_twtoUnicode),"euc-tw",
UCNV_TO_U_CALLBACK_STOP, from_euc_twOffs, NULL, 0 ))
log_err("euc-tw->u with stop did not match.\n");
}
@ -1326,7 +1326,7 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
static const int32_t offsets1[] = { 0x0000, 0x0001};
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8",
expected1, UPRV_LENGTHOF(expected1),"utf8",
UCNV_TO_U_CALLBACK_STOP, offsets1, NULL, 0 ))
log_err("utf8->u with stop did not match.\n");;
}
@ -1337,7 +1337,7 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
static const int32_t offsets1[] = { 0x0000, 0x0001,0x0002,0x0003};
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"SCSU",
expected1, UPRV_LENGTHOF(expected1),"SCSU",
UCNV_TO_U_CALLBACK_STOP, offsets1, NULL, 0 ))
log_err("scsu->u with stop did not match.\n");;
}
@ -1376,15 +1376,15 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
/*from unicode*/
#if !UCONFIG_NO_LEGACY_CONVERSION
if(!testConvertFromUnicode(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromUnicode(sampleText, UPRV_LENGTHOF(sampleText),
expsubIBM_949, sizeof(expsubIBM_949), "ibm-949",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, toIBM949Offssub, NULL, 0 ))
log_err("u-> ibm-949 with subst did not match.\n");
if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!testConvertFromUnicode(sampleText2, UPRV_LENGTHOF(sampleText2),
expsubIBM_943, sizeof(expsubIBM_943), "ibm-943",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, toIBM943Offssub , NULL, 0))
log_err("u-> ibm-943 with subst did not match.\n");
if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!testConvertFromUnicode(sampleText2, UPRV_LENGTHOF(sampleText2),
expsubIBM_930, sizeof(expsubIBM_930), "ibm-930",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, toIBM930Offssub, NULL, 0 ))
log_err("u-> ibm-930 with subst did not match.\n");
@ -1414,17 +1414,17 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
static const int32_t from_euc_twOffs [] ={ 0, 1, 1, 2, 2, 2, 2, 3, 3, 5, 5, 6, 7, 7, 8,};
if(!testConvertFromUnicode(inputTest, sizeof(inputTest)/sizeof(inputTest[0]),
if(!testConvertFromUnicode(inputTest, UPRV_LENGTHOF(inputTest),
toIBM943, sizeof(toIBM943), "ibm-943",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, offset, NULL, 0 ))
log_err("u-> ibm-943 with substitute did not match.\n");
if(!testConvertFromUnicode(euc_jp_inputText, sizeof(euc_jp_inputText)/sizeof(euc_jp_inputText[0]),
if(!testConvertFromUnicode(euc_jp_inputText, UPRV_LENGTHOF(euc_jp_inputText),
to_euc_jp, sizeof(to_euc_jp), "IBM-eucJP",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, fromEUC_JPOffs, NULL, 0 ))
log_err("u-> euc-jp with substitute did not match.\n");
if(!testConvertFromUnicode(euc_tw_inputText, sizeof(euc_tw_inputText)/sizeof(euc_tw_inputText[0]),
if(!testConvertFromUnicode(euc_tw_inputText, UPRV_LENGTHOF(euc_tw_inputText),
to_euc_tw, sizeof(to_euc_tw), "euc-tw",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, from_euc_twOffs, NULL, 0 ))
log_err("u-> euc-tw with substitute did not match.\n");
@ -1456,12 +1456,12 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
0,
};
if(!testConvertFromUnicode(SCSU_inputText, sizeof(SCSU_inputText)/sizeof(SCSU_inputText[0]),
if(!testConvertFromUnicode(SCSU_inputText, UPRV_LENGTHOF(SCSU_inputText),
to_SCSU, sizeof(to_SCSU), "SCSU",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, from_SCSUOffs, NULL, 0 ))
log_err("u-> SCSU with substitute did not match.\n");
if(!testConvertFromUnicodeWithContext(SCSU_inputText, sizeof(SCSU_inputText)/sizeof(SCSU_inputText[0]),
if(!testConvertFromUnicodeWithContext(SCSU_inputText, UPRV_LENGTHOF(SCSU_inputText),
to_SCSU_1, sizeof(to_SCSU_1), "SCSU",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, from_SCSUOffs_1, NULL, 0,"i",U_ILLEGAL_CHAR_FOUND ))
log_err("u-> SCSU with substitute did not match.\n");
@ -1477,7 +1477,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
};
static const int32_t offsets[]={ 0, 0, 0, 1, 1, 1, 1, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6 };
if(!testConvertFromUnicode(testinput, sizeof(testinput)/sizeof(testinput[0]),
if(!testConvertFromUnicode(testinput, UPRV_LENGTHOF(testinput),
expectedUTF8, sizeof(expectedUTF8), "utf8",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, offsets, NULL, 0 )) {
log_err("u-> utf8 with stop did not match.\n");
@ -1503,7 +1503,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
-1, -1, 0, 0, 1, 1
};
if(!testConvertFromUnicode(in, ARRAY_LENGTH(in),
if(!testConvertFromUnicode(in, UPRV_LENGTHOF(in),
out, sizeof(out), "UTF-16",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, offsets, NULL, 0)
) {
@ -1530,7 +1530,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
-1, -1, -1, -1, 0, 0, 0, 0, 1, 1, 1, 1
};
if(!testConvertFromUnicode(in, ARRAY_LENGTH(in),
if(!testConvertFromUnicode(in, UPRV_LENGTHOF(in),
out, sizeof(out), "UTF-32",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, offsets, NULL, 0)
) {
@ -1542,15 +1542,15 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
#if !UCONFIG_NO_LEGACY_CONVERSION
if(!testConvertToUnicode(expsubIBM_949, sizeof(expsubIBM_949),
IBM_949subtoUnicode, sizeof(IBM_949subtoUnicode)/sizeof(IBM_949subtoUnicode[0]),"ibm-949",
IBM_949subtoUnicode, UPRV_LENGTHOF(IBM_949subtoUnicode),"ibm-949",
UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM949Offs, NULL, 0 ))
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",
IBM_943subtoUnicode, UPRV_LENGTHOF(IBM_943subtoUnicode),"ibm-943",
UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM943Offs, NULL, 0 ))
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",
IBM_930subtoUnicode, UPRV_LENGTHOF(IBM_930subtoUnicode),"ibm-930",
UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM930Offs, NULL, 0 ))
log_err("ibm-930->u with substitute did not match.\n");
@ -1584,25 +1584,25 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleTxtEBCIDIC_STATEFUL, sizeof(sampleTxtEBCIDIC_STATEFUL),
EBCIDIC_STATEFUL_toUnicode, sizeof(EBCIDIC_STATEFUL_toUnicode)/sizeof(EBCIDIC_STATEFUL_toUnicode[0]),"ibm-930",
EBCIDIC_STATEFUL_toUnicode, UPRV_LENGTHOF(EBCIDIC_STATEFUL_toUnicode),"ibm-930",
UCNV_TO_U_CALLBACK_SUBSTITUTE, from_EBCIDIC_STATEFULOffsets, NULL, 0 ))
log_err("EBCIDIC_STATEFUL->u with substitute did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_jp, sizeof(sampleTxt_euc_jp),
euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"IBM-eucJP",
euc_jptoUnicode, UPRV_LENGTHOF(euc_jptoUnicode),"IBM-eucJP",
UCNV_TO_U_CALLBACK_SUBSTITUTE, from_euc_jpOffs, NULL, 0 ))
log_err("euc-jp->u with substitute did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_tw, sizeof(sampleTxt_euc_tw),
euc_twtoUnicode, sizeof(euc_twtoUnicode)/sizeof(euc_twtoUnicode[0]),"euc-tw",
euc_twtoUnicode, UPRV_LENGTHOF(euc_twtoUnicode),"euc-tw",
UCNV_TO_U_CALLBACK_SUBSTITUTE, from_euc_twOffs, NULL, 0 ))
log_err("euc-tw->u with substitute did not match.\n");
if(!testConvertToUnicodeWithContext(sampleTxt_euc_jp, sizeof(sampleTxt_euc_jp),
euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"IBM-eucJP",
euc_jptoUnicode, UPRV_LENGTHOF(euc_jptoUnicode),"IBM-eucJP",
UCNV_TO_U_CALLBACK_SUBSTITUTE, from_euc_jpOffs, NULL, 0 ,"i", U_ILLEGAL_CHAR_FOUND))
log_err("euc-jp->u with substitute did not match.\n");
}
@ -1616,7 +1616,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
int32_t offsets1[] = { 0x0000, 0x0001, 0x0004, 0x0006};
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8",
expected1, UPRV_LENGTHOF(expected1),"utf8",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0 ))
log_err("utf8->u with substitute did not match.\n");;
}
@ -1627,7 +1627,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
int32_t offsets1[] = { 0x0000, 0x0001,0x0002,0x0003,4,5};
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"SCSU",
expected1, UPRV_LENGTHOF(expected1),"SCSU",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0 ))
log_err("scsu->u with stop did not match.\n");;
}
@ -1643,13 +1643,13 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
static const uint8_t s2[]={ 0x0e, 0x5d, 0x5f, 0x5d, 0x63, 0xfc, 0xfc, 0x46, 0x6b, 0x0f, 0x57 };
static const int32_t offsets2[]={ 1, 3, 5, 7, 10 };
if(!testConvertFromUnicode(u1, ARRAY_LENGTH(u1), s1, ARRAY_LENGTH(s1), "ibm-930",
if(!testConvertFromUnicode(u1, UPRV_LENGTHOF(u1), s1, UPRV_LENGTHOF(s1), "ibm-930",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0)
) {
log_err("u->ibm-930 subchar/subchar1 did not match.\n");
}
if(!testConvertToUnicode(s2, ARRAY_LENGTH(s2), u2, ARRAY_LENGTH(u2), "ibm-930",
if(!testConvertToUnicode(s2, UPRV_LENGTHOF(s2), u2, UPRV_LENGTHOF(u2), "ibm-930",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets2, NULL, 0)
) {
log_err("ibm-930->u subchar/subchar1 did not match.\n");
@ -1665,7 +1665,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
static const int32_t offsets2[]={
0, 1, 2, 6, 8, 10, 12, 16, 20, 20, 24, 28, 28 };
if(!testConvertToUnicode(gb2, ARRAY_LENGTH(gb2), u2, ARRAY_LENGTH(u2), "gb18030",
if(!testConvertToUnicode(gb2, UPRV_LENGTHOF(gb2), u2, UPRV_LENGTHOF(u2), "gb18030",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets2, NULL, 0)
) {
log_err("gb18030->u with substitute did not match.\n");
@ -1686,7 +1686,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
0, 1, 2, 4, 6, 7, 9, 11, 12, 14, 17, 19, 21, 22, 23, 24
};
if(!testConvertToUnicode(utf7, ARRAY_LENGTH(utf7), unicode, ARRAY_LENGTH(unicode), "UTF-7",
if(!testConvertToUnicode(utf7, UPRV_LENGTHOF(utf7), unicode, UPRV_LENGTHOF(unicode), "UTF-7",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets, NULL, 0)
) {
log_err("UTF-7->u with substitute did not match.\n");
@ -1710,19 +1710,19 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
offsets2[]={ 2, 4 },
offsets3[]={ 0, 2, 4 };
if(!testConvertToUnicode(in1, ARRAY_LENGTH(in1), out1, ARRAY_LENGTH(out1), "UTF-16",
if(!testConvertToUnicode(in1, UPRV_LENGTHOF(in1), out1, UPRV_LENGTHOF(out1), "UTF-16",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0)
) {
log_err("UTF-16 (BE BOM)->u with substitute did not match.\n");
}
if(!testConvertToUnicode(in2, ARRAY_LENGTH(in2), out2, ARRAY_LENGTH(out2), "UTF-16",
if(!testConvertToUnicode(in2, UPRV_LENGTHOF(in2), out2, UPRV_LENGTHOF(out2), "UTF-16",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets2, NULL, 0)
) {
log_err("UTF-16 (LE BOM)->u with substitute did not match.\n");
}
if(!testConvertToUnicode(in3, ARRAY_LENGTH(in3), out3, ARRAY_LENGTH(out3), "UTF-16",
if(!testConvertToUnicode(in3, UPRV_LENGTHOF(in3), out3, UPRV_LENGTHOF(out3), "UTF-16",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets3, NULL, 0)
) {
log_err("UTF-16 (no BOM)->u with substitute did not match.\n");
@ -1749,25 +1749,25 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
offsets3[]={ 0, 4, 4, 8, 12 },
offsets4[]={ 0, 0, 4, 8 };
if(!testConvertToUnicode(in1, ARRAY_LENGTH(in1), out1, ARRAY_LENGTH(out1), "UTF-32",
if(!testConvertToUnicode(in1, UPRV_LENGTHOF(in1), out1, UPRV_LENGTHOF(out1), "UTF-32",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0)
) {
log_err("UTF-32 (BE BOM)->u with substitute did not match.\n");
}
if(!testConvertToUnicode(in2, ARRAY_LENGTH(in2), out2, ARRAY_LENGTH(out2), "UTF-32",
if(!testConvertToUnicode(in2, UPRV_LENGTHOF(in2), out2, UPRV_LENGTHOF(out2), "UTF-32",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets2, NULL, 0)
) {
log_err("UTF-32 (LE BOM)->u with substitute did not match.\n");
}
if(!testConvertToUnicode(in3, ARRAY_LENGTH(in3), out3, ARRAY_LENGTH(out3), "UTF-32",
if(!testConvertToUnicode(in3, UPRV_LENGTHOF(in3), out3, UPRV_LENGTHOF(out3), "UTF-32",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets3, NULL, 0)
) {
log_err("UTF-32 (no BOM)->u with substitute did not match.\n");
}
if(!testConvertToUnicode(in4, ARRAY_LENGTH(in4), out4, ARRAY_LENGTH(out4), "UTF-32",
if(!testConvertToUnicode(in4, UPRV_LENGTHOF(in4), out4, UPRV_LENGTHOF(out4), "UTF-32",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets4, NULL, 0)
) {
log_err("UTF-32 (no BOM, with error)->u with substitute did not match.\n");
@ -1801,17 +1801,17 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
/*from Unicode*/
#if !UCONFIG_NO_LEGACY_CONVERSION
if(!testConvertFromUnicode(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromUnicode(sampleText, UPRV_LENGTHOF(sampleText),
expsubwvalIBM_949, sizeof(expsubwvalIBM_949), "ibm-949",
UCNV_FROM_U_CALLBACK_ESCAPE, toIBM949Offs, NULL, 0 ))
log_err("u-> ibm-949 with subst with value did not match.\n");
if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!testConvertFromUnicode(sampleText2, UPRV_LENGTHOF(sampleText2),
expsubwvalIBM_943, sizeof(expsubwvalIBM_943), "ibm-943",
UCNV_FROM_U_CALLBACK_ESCAPE, toIBM943Offs, NULL, 0 ))
log_err("u-> ibm-943 with sub with value did not match.\n");
if(!testConvertFromUnicode(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!testConvertFromUnicode(sampleText2, UPRV_LENGTHOF(sampleText2),
expsubwvalIBM_930, sizeof(expsubwvalIBM_930), "ibm-930",
UCNV_FROM_U_CALLBACK_ESCAPE, toIBM930Offs, NULL, 0 ))
log_err("u-> ibm-930 with subst with value did not match.\n");
@ -2045,32 +2045,32 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
6,
};
if(!testConvertFromUnicode(inputTest, sizeof(inputTest)/sizeof(inputTest[0]),
if(!testConvertFromUnicode(inputTest, UPRV_LENGTHOF(inputTest),
toIBM943, sizeof(toIBM943), "ibm-943",
UCNV_FROM_U_CALLBACK_ESCAPE, offset, NULL, 0 ))
log_err("u-> ibm-943 with subst with value did not match.\n");
if(!testConvertFromUnicode(euc_jp_inputText, sizeof(euc_jp_inputText)/sizeof(euc_jp_inputText[0]),
if(!testConvertFromUnicode(euc_jp_inputText, UPRV_LENGTHOF(euc_jp_inputText),
to_euc_jp, sizeof(to_euc_jp), "IBM-eucJP",
UCNV_FROM_U_CALLBACK_ESCAPE, fromEUC_JPOffs, NULL, 0 ))
log_err("u-> euc-jp with subst with value did not match.\n");
if(!testConvertFromUnicode(euc_tw_inputText, sizeof(euc_tw_inputText)/sizeof(euc_tw_inputText[0]),
if(!testConvertFromUnicode(euc_tw_inputText, UPRV_LENGTHOF(euc_tw_inputText),
to_euc_tw, sizeof(to_euc_tw), "euc-tw",
UCNV_FROM_U_CALLBACK_ESCAPE, from_euc_twOffs, NULL, 0 ))
log_err("u-> euc-tw with subst with value did not match.\n");
if(!testConvertFromUnicode(iso_2022_jp_inputText1, sizeof(iso_2022_jp_inputText1)/sizeof(iso_2022_jp_inputText1[0]),
if(!testConvertFromUnicode(iso_2022_jp_inputText1, UPRV_LENGTHOF(iso_2022_jp_inputText1),
to_iso_2022_jp1, sizeof(to_iso_2022_jp1), "iso-2022-jp",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_jpOffs1, NULL, 0 ))
log_err("u-> iso_2022_jp with subst with value did not match.\n");
if(!testConvertFromUnicode(iso_2022_jp_inputText1, sizeof(iso_2022_jp_inputText1)/sizeof(iso_2022_jp_inputText1[0]),
if(!testConvertFromUnicode(iso_2022_jp_inputText1, UPRV_LENGTHOF(iso_2022_jp_inputText1),
to_iso_2022_jp1, sizeof(to_iso_2022_jp1), "iso-2022-jp",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_jpOffs1, NULL, 0 ))
log_err("u-> iso_2022_jp with subst with value did not match.\n");
if(!testConvertFromUnicode(iso_2022_jp_inputText2, sizeof(iso_2022_jp_inputText2)/sizeof(iso_2022_jp_inputText2[0]),
if(!testConvertFromUnicode(iso_2022_jp_inputText2, UPRV_LENGTHOF(iso_2022_jp_inputText2),
to_iso_2022_jp2, sizeof(to_iso_2022_jp2), "iso-2022-jp",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_jpOffs2, NULL, 0 ))
log_err("u-> iso_2022_jp with subst with value did not match.\n");
@ -2100,7 +2100,7 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
7,7,7,7,7,7,7,7,7
};
if(!testConvertFromUnicodeWithContext(iso_2022_jp_inputText3, sizeof(iso_2022_jp_inputText3)/sizeof(iso_2022_jp_inputText3[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_jp_inputText3, UPRV_LENGTHOF(iso_2022_jp_inputText3),
to_iso_2022_jp3_v2, sizeof(to_iso_2022_jp3_v2), "iso-2022-jp",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_jpOffs3_v2, NULL, 0,UCNV_ESCAPE_XML_DEC,U_ZERO_ERROR ))
log_err("u-> iso-2022-jp with sub & UCNV_ESCAPE_XML_DEC did not match.\n");
@ -2127,7 +2127,7 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
6,
7,7,7,7,7,7
};
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText5, sizeof(iso_2022_cn_inputText5)/sizeof(iso_2022_cn_inputText5[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText5, UPRV_LENGTHOF(iso_2022_cn_inputText5),
to_iso_2022_cn5_v2, sizeof(to_iso_2022_cn5_v2), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_cnOffs5_v2, NULL, 0,UCNV_ESCAPE_JAVA,U_ZERO_ERROR ))
log_err("u-> iso-2022-cn with sub & UCNV_ESCAPE_JAVA did not match.\n");
@ -2151,7 +2151,7 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
6,
7, 7, 7, 7, 7, 7, 7, 7,
};
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText6, sizeof(iso_2022_cn_inputText6)/sizeof(iso_2022_cn_inputText6[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText6, UPRV_LENGTHOF(iso_2022_cn_inputText6),
to_iso_2022_cn6_v2, sizeof(to_iso_2022_cn6_v2), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_cnOffs6_v2, NULL, 0,UCNV_ESCAPE_UNICODE,U_ZERO_ERROR ))
log_err("u-> iso-2022-cn with sub & UCNV_ESCAPE_UNICODE did not match.\n");
@ -2174,7 +2174,7 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
6,
7, 7, 7, 7, 7, 7,
};
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText7, sizeof(iso_2022_cn_inputText7)/sizeof(iso_2022_cn_inputText7[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText7, UPRV_LENGTHOF(iso_2022_cn_inputText7),
to_iso_2022_cn7_v2, sizeof(to_iso_2022_cn7_v2), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_cnOffs7_v2, NULL, 0,"K" ,U_ZERO_ERROR ))
log_err("u-> iso-2022-cn with sub & K did not match.\n");
@ -2207,7 +2207,7 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
8,
9, 9, 9, 9, 9
};
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText8, sizeof(iso_2022_cn_inputText8)/sizeof(iso_2022_cn_inputText8[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText8, UPRV_LENGTHOF(iso_2022_cn_inputText8),
to_iso_2022_cn8_v2, sizeof(to_iso_2022_cn8_v2), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_cnOffs8_v2, NULL, 0,UCNV_ESCAPE_CSS2,U_ZERO_ERROR ))
log_err("u-> iso-2022-cn with sub & UCNV_ESCAPE_CSS2 did not match.\n");
@ -2233,40 +2233,40 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
6
};
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText4, sizeof(iso_2022_cn_inputText4)/sizeof(iso_2022_cn_inputText4[0]),
if(!testConvertFromUnicodeWithContext(iso_2022_cn_inputText4, UPRV_LENGTHOF(iso_2022_cn_inputText4),
to_iso_2022_cn4_v3, sizeof(to_iso_2022_cn4_v3), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_cnOffs4_v3, NULL, 0,UCNV_ESCAPE_C,U_ZERO_ERROR ))
{
log_err("u-> iso-2022-cn with skip & UCNV_ESCAPE_C did not match.\n");
}
}
if(!testConvertFromUnicode(iso_2022_cn_inputText, sizeof(iso_2022_cn_inputText)/sizeof(iso_2022_cn_inputText[0]),
if(!testConvertFromUnicode(iso_2022_cn_inputText, UPRV_LENGTHOF(iso_2022_cn_inputText),
to_iso_2022_cn, sizeof(to_iso_2022_cn), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_cnOffs, NULL, 0 ))
log_err("u-> iso_2022_cn with subst with value did not match.\n");
if(!testConvertFromUnicode(iso_2022_cn_inputText4, sizeof(iso_2022_cn_inputText4)/sizeof(iso_2022_cn_inputText4[0]),
if(!testConvertFromUnicode(iso_2022_cn_inputText4, UPRV_LENGTHOF(iso_2022_cn_inputText4),
to_iso_2022_cn4, sizeof(to_iso_2022_cn4), "iso-2022-cn",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_cnOffs4, NULL, 0 ))
log_err("u-> iso_2022_cn with subst with value did not match.\n");
if(!testConvertFromUnicode(iso_2022_kr_inputText, sizeof(iso_2022_kr_inputText)/sizeof(iso_2022_kr_inputText[0]),
if(!testConvertFromUnicode(iso_2022_kr_inputText, UPRV_LENGTHOF(iso_2022_kr_inputText),
to_iso_2022_kr, sizeof(to_iso_2022_kr), "iso-2022-kr",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_krOffs, NULL, 0 ))
log_err("u-> iso_2022_kr with subst with value did not match.\n");
if(!testConvertFromUnicode(iso_2022_kr_inputText2, sizeof(iso_2022_kr_inputText2)/sizeof(iso_2022_kr_inputText2[0]),
if(!testConvertFromUnicode(iso_2022_kr_inputText2, UPRV_LENGTHOF(iso_2022_kr_inputText2),
to_iso_2022_kr2, sizeof(to_iso_2022_kr2), "iso-2022-kr",
UCNV_FROM_U_CALLBACK_ESCAPE, from_iso_2022_krOffs2, NULL, 0 ))
log_err("u-> iso_2022_kr2 with subst with value did not match.\n");
if(!testConvertFromUnicode(hz_inputText, sizeof(hz_inputText)/sizeof(hz_inputText[0]),
if(!testConvertFromUnicode(hz_inputText, UPRV_LENGTHOF(hz_inputText),
to_hz, sizeof(to_hz), "HZ",
UCNV_FROM_U_CALLBACK_ESCAPE, from_hzOffs, NULL, 0 ))
log_err("u-> hz with subst with value did not match.\n");
if(!testConvertFromUnicode(hz_inputText2, sizeof(hz_inputText2)/sizeof(hz_inputText2[0]),
if(!testConvertFromUnicode(hz_inputText2, UPRV_LENGTHOF(hz_inputText2),
to_hz2, sizeof(to_hz2), "HZ",
UCNV_FROM_U_CALLBACK_ESCAPE, from_hzOffs2, NULL, 0 ))
log_err("u-> hz with subst with value did not match.\n");
if(!testConvertFromUnicode(iscii_inputText, sizeof(iscii_inputText)/sizeof(iscii_inputText[0]),
if(!testConvertFromUnicode(iscii_inputText, UPRV_LENGTHOF(iscii_inputText),
to_iscii, sizeof(to_iscii), "ISCII,version=0",
UCNV_FROM_U_CALLBACK_ESCAPE, from_isciiOffs, NULL, 0 ))
log_err("u-> iscii with subst with value did not match.\n");
@ -2430,27 +2430,27 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
#if !UCONFIG_NO_LEGACY_CONVERSION
if(!testConvertToUnicode(sampleTxtToU, sizeof(sampleTxtToU),
IBM_943toUnicode, sizeof(IBM_943toUnicode)/sizeof(IBM_943toUnicode[0]),"ibm-943",
IBM_943toUnicode, UPRV_LENGTHOF(IBM_943toUnicode),"ibm-943",
UCNV_TO_U_CALLBACK_ESCAPE, fromIBM943Offs, NULL, 0 ))
log_err("ibm-943->u with substitute with value did not match.\n");
if(!testConvertToUnicode(sampleTxt_EUC_JP, sizeof(sampleTxt_EUC_JP),
EUC_JPtoUnicode, sizeof(EUC_JPtoUnicode)/sizeof(EUC_JPtoUnicode[0]),"IBM-eucJP",
EUC_JPtoUnicode, UPRV_LENGTHOF(EUC_JPtoUnicode),"IBM-eucJP",
UCNV_TO_U_CALLBACK_ESCAPE, fromEUC_JPOffs, NULL, 0))
log_err("euc-jp->u with substitute with value did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_tw, sizeof(sampleTxt_euc_tw),
euc_twtoUnicode, sizeof(euc_twtoUnicode)/sizeof(euc_twtoUnicode[0]),"euc-tw",
euc_twtoUnicode, UPRV_LENGTHOF(euc_twtoUnicode),"euc-tw",
UCNV_TO_U_CALLBACK_ESCAPE, from_euc_twOffs, NULL, 0))
log_err("euc-tw->u with substitute with value did not match.\n");
if(!testConvertToUnicode(sampleTxt_iso_2022_jp, sizeof(sampleTxt_iso_2022_jp),
iso_2022_jptoUnicode, sizeof(iso_2022_jptoUnicode)/sizeof(iso_2022_jptoUnicode[0]),"iso-2022-jp",
iso_2022_jptoUnicode, UPRV_LENGTHOF(iso_2022_jptoUnicode),"iso-2022-jp",
UCNV_TO_U_CALLBACK_ESCAPE, from_iso_2022_jpOffs, NULL, 0))
log_err("iso-2022-jp->u with substitute with value did not match.\n");
if(!testConvertToUnicodeWithContext(sampleTxt_iso_2022_jp, sizeof(sampleTxt_iso_2022_jp),
iso_2022_jptoUnicode, sizeof(iso_2022_jptoUnicode)/sizeof(iso_2022_jptoUnicode[0]),"iso-2022-jp",
iso_2022_jptoUnicode, UPRV_LENGTHOF(iso_2022_jptoUnicode),"iso-2022-jp",
UCNV_TO_U_CALLBACK_ESCAPE, from_iso_2022_jpOffs, NULL, 0,"K",U_ZERO_ERROR))
log_err("iso-2022-jp->u with substitute with value did not match.\n");
@ -2495,32 +2495,32 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize)
}
}
if(!testConvertToUnicode(sampleTxt_iso_2022_cn, sizeof(sampleTxt_iso_2022_cn),
iso_2022_cntoUnicode, sizeof(iso_2022_cntoUnicode)/sizeof(iso_2022_cntoUnicode[0]),"iso-2022-cn",
iso_2022_cntoUnicode, UPRV_LENGTHOF(iso_2022_cntoUnicode),"iso-2022-cn",
UCNV_TO_U_CALLBACK_ESCAPE, from_iso_2022_cnOffs, NULL, 0))
log_err("iso-2022-cn->u with substitute with value did not match.\n");
if(!testConvertToUnicode(sampleTxt_iso_2022_kr, sizeof(sampleTxt_iso_2022_kr),
iso_2022_krtoUnicode, sizeof(iso_2022_krtoUnicode)/sizeof(iso_2022_krtoUnicode[0]),"iso-2022-kr",
iso_2022_krtoUnicode, UPRV_LENGTHOF(iso_2022_krtoUnicode),"iso-2022-kr",
UCNV_TO_U_CALLBACK_ESCAPE, from_iso_2022_krOffs, NULL, 0))
log_err("iso-2022-kr->u with substitute with value did not match.\n");
if(!testConvertToUnicode(sampleTxt_hz, sizeof(sampleTxt_hz),
hztoUnicode, sizeof(hztoUnicode)/sizeof(hztoUnicode[0]),"HZ",
hztoUnicode, UPRV_LENGTHOF(hztoUnicode),"HZ",
UCNV_TO_U_CALLBACK_ESCAPE, from_hzOffs, NULL, 0))
log_err("hz->u with substitute with value did not match.\n");
if(!testConvertToUnicode(sampleTxt_iscii, sizeof(sampleTxt_iscii),
isciitoUnicode, sizeof(isciitoUnicode)/sizeof(isciitoUnicode[0]),"ISCII,version=0",
isciitoUnicode, UPRV_LENGTHOF(isciitoUnicode),"ISCII,version=0",
UCNV_TO_U_CALLBACK_ESCAPE, from_isciiOffs, NULL, 0))
log_err("ISCII ->u with substitute with value did not match.\n");
#endif
if(!testConvertToUnicode(sampleTxtUTF8, sizeof(sampleTxtUTF8),
UTF8ToUnicode, sizeof(UTF8ToUnicode)/sizeof(UTF8ToUnicode[0]),"UTF-8",
UTF8ToUnicode, UPRV_LENGTHOF(UTF8ToUnicode),"UTF-8",
UCNV_TO_U_CALLBACK_ESCAPE, fromUTF8, NULL, 0))
log_err("UTF8->u with UCNV_TO_U_CALLBACK_ESCAPE with value did not match.\n");
if(!testConvertToUnicodeWithContext(sampleTxtUTF8, sizeof(sampleTxtUTF8),
UTF8ToUnicodeXML_DEC, sizeof(UTF8ToUnicodeXML_DEC)/sizeof(UTF8ToUnicodeXML_DEC[0]),"UTF-8",
UTF8ToUnicodeXML_DEC, UPRV_LENGTHOF(UTF8ToUnicodeXML_DEC),"UTF-8",
UCNV_TO_U_CALLBACK_ESCAPE, fromUTF8XML_DEC, NULL, 0, UCNV_ESCAPE_XML_DEC, U_ZERO_ERROR))
log_err("UTF8->u with UCNV_TO_U_CALLBACK_ESCAPE with value did not match.\n");
}
@ -2547,25 +2547,25 @@ static void TestLegalAndOthers(int32_t inputsize, int32_t outputsize)
gInBufferSize = inputsize;
gOutBufferSize = outputsize;
/*checking with a legal value*/
if(!testConvertFromUnicode(legalText, sizeof(legalText)/sizeof(legalText[0]),
if(!testConvertFromUnicode(legalText, UPRV_LENGTHOF(legalText),
templegal949, sizeof(templegal949), "ibm-949",
UCNV_FROM_U_CALLBACK_SKIP, to949legal, NULL, 0 ))
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",
toUnicode943sub, UPRV_LENGTHOF(toUnicode943sub),"ibm-943",
UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM943Offssub, NULL, 0 ))
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",
toUnicode943skip, UPRV_LENGTHOF(toUnicode943skip),"ibm-943",
UCNV_TO_U_CALLBACK_SKIP, fromIBM943Offsskip, NULL, 0 ))
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",
toUnicode943stop, UPRV_LENGTHOF(toUnicode943stop),"ibm-943",
UCNV_TO_U_CALLBACK_STOP, fromIBM943Offsstop, NULL, 0 ))
log_err("ibm-943->u with stop did not match.\n");
@ -2583,7 +2583,7 @@ static void TestSingleByte(int32_t inputsize, int32_t outputsize)
gOutBufferSize = outputsize;
if(!testConvertToUnicode(sampleText, sizeof(sampleText),
toUnicode943sub, sizeof(toUnicode943sub)/sizeof(toUnicode943sub[0]),"ibm-943",
toUnicode943sub, UPRV_LENGTHOF(toUnicode943sub),"ibm-943",
UCNV_TO_U_CALLBACK_SUBSTITUTE, fromIBM943Offssub, NULL, 0 ))
log_err("ibm-943->u with subst did not match.\n");
}
@ -2604,12 +2604,12 @@ static void TestEBCDIC_STATEFUL_Sub(int32_t inputsize, int32_t outputsize)
gInBufferSize = inputsize;
gOutBufferSize = outputsize;
if(!testConvertFromUnicode(ebcdic_inputTest, sizeof(ebcdic_inputTest)/sizeof(ebcdic_inputTest[0]),
if(!testConvertFromUnicode(ebcdic_inputTest, UPRV_LENGTHOF(ebcdic_inputTest),
toIBM930, sizeof(toIBM930), "ibm-930",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, offset_930, NULL, 0 ))
log_err("u-> ibm-930(EBCDIC_STATEFUL) with subst did not match.\n");
if(!testConvertFromUnicode(ebcdic_inputTest, sizeof(ebcdic_inputTest)/sizeof(ebcdic_inputTest[0]),
if(!testConvertFromUnicode(ebcdic_inputTest, UPRV_LENGTHOF(ebcdic_inputTest),
toIBM930_subvaried, sizeof(toIBM930_subvaried), "ibm-930",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, offset_930_subvaried, mySubChar, 1 ))
log_err("u-> ibm-930(EBCDIC_STATEFUL) with subst(setSubChar=0x3f) did not match.\n");
@ -2682,7 +2682,7 @@ UBool testConvertFromUnicode(const UChar *source, int sourceLen, const uint8_t
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = source + sourceLen;
@ -2863,7 +2863,7 @@ UBool testConvertToUnicode( const uint8_t *source, int sourcelen, const UChar *e
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = src + sourcelen;
/*----setting the callback routine----*/
@ -3073,7 +3073,7 @@ UBool testConvertFromUnicodeWithContext(const UChar *source, int sourceLen, con
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = source + sourceLen;
@ -3236,7 +3236,7 @@ UBool testConvertToUnicodeWithContext( const uint8_t *source, int sourcelen, con
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = src + sourcelen;
/*----setting the callback routine----*/

50
icu4c/source/test/cintltst/ncnvfbts.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2012, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
***************************************************************************/
/*****************************************************************************
@ -178,7 +178,7 @@ static UBool testConvertFromUnicode(const UChar *source, int sourceLen, const u
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = source + sourceLen;
@ -336,7 +336,7 @@ static UBool testConvertToUnicode( const uint8_t *source, int sourcelen, const U
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = src + sourcelen;
/*----setting the fallback routine----*/
@ -542,34 +542,34 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize )
gInBufferSize = insize;
gOutBufferSize = outsize;
for(i=0; i<sizeof(nativeCodePage)/sizeof(nativeCodePage[0]); i++){
for(i=0; i<UPRV_LENGTHOF(nativeCodePage); i++){
log_verbose("Testing %s\n", nativeCodePage[i]);
if(!testConvertFromUnicode(SBCSText, sizeof(SBCSText)/sizeof(SBCSText[0]),
if(!testConvertFromUnicode(SBCSText, UPRV_LENGTHOF(SBCSText),
expectedNative, sizeof(expectedNative), nativeCodePage[i], TRUE, toNativeOffs ))
log_err("u-> %s(SBCS) with FallBack did not match.\n", nativeCodePage[i]);
if(!testConvertToUnicode(expectedNative, sizeof(expectedNative),
retrievedSBCSText, sizeof(retrievedSBCSText)/sizeof(retrievedSBCSText[0]), nativeCodePage[i], TRUE, fromNativeoffs ))
retrievedSBCSText, UPRV_LENGTHOF(retrievedSBCSText), nativeCodePage[i], TRUE, fromNativeoffs ))
log_err("%s->u(SBCS) with Fallback did not match.\n", nativeCodePage[i]);
}
/*DBCS*/
if(!testConvertFromUnicode(DBCSText, sizeof(DBCSText)/sizeof(DBCSText[0]),
if(!testConvertFromUnicode(DBCSText, UPRV_LENGTHOF(DBCSText),
expectedIBM1363_DBCS, sizeof(expectedIBM1363_DBCS), "ibm-1363", TRUE, toIBM1363Offs_DBCS ))
log_err("u-> ibm-1363(DBCS portion) with FallBack did not match.\n");
if(!testConvertToUnicode(expectedIBM1363_DBCS, sizeof(expectedIBM1363_DBCS),
retrievedDBCSText, sizeof(retrievedDBCSText)/sizeof(retrievedDBCSText[0]),"ibm-1363", TRUE, fromIBM1363offs_DBCS ))
retrievedDBCSText, UPRV_LENGTHOF(retrievedDBCSText),"ibm-1363", TRUE, fromIBM1363offs_DBCS ))
log_err("ibm-1363->u(DBCS portion) with Fallback did not match.\n");
/*MBCS*/
if(!testConvertFromUnicode(MBCSText, sizeof(MBCSText)/sizeof(MBCSText[0]),
if(!testConvertFromUnicode(MBCSText, UPRV_LENGTHOF(MBCSText),
expectedIBM950, sizeof(expectedIBM950), "ibm-950", TRUE, toIBM950Offs ))
log_err("u-> ibm-950(MBCS) with FallBack did not match.\n");
if(!testConvertToUnicode(expectedIBM950, sizeof(expectedIBM950),
retrievedMBCSText, sizeof(retrievedMBCSText)/sizeof(retrievedMBCSText[0]),"ibm-950", TRUE, fromIBM950offs ))
retrievedMBCSText, UPRV_LENGTHOF(retrievedMBCSText),"ibm-950", TRUE, fromIBM950offs ))
log_err("ibm-950->u(MBCS) with Fallback did not match.\n");
/*commented untill data table is available*/
@ -584,10 +584,10 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize )
UChar expectedFallbackFalse[]= { 0x5165, 0x5165, 0x516b, 0x516b, 0x9ef9, 0x9ef9};
if(!testConvertToUnicode(IBM950input, sizeof(IBM950input),
expectedUnicodeText, sizeof(expectedUnicodeText)/sizeof(expectedUnicodeText[0]),"ibm-950", TRUE, fromIBM950inputOffs ))
expectedUnicodeText, UPRV_LENGTHOF(expectedUnicodeText),"ibm-950", TRUE, fromIBM950inputOffs ))
log_err("ibm-950->u(MBCS) with Fallback did not match.\n");
if(!testConvertToUnicode(IBM950input, sizeof(IBM950input),
expectedFallbackFalse, sizeof(expectedFallbackFalse)/sizeof(expectedFallbackFalse[0]),"ibm-950", FALSE, fromIBM950inputOffs ))
expectedFallbackFalse, UPRV_LENGTHOF(expectedFallbackFalse),"ibm-950", FALSE, fromIBM950inputOffs ))
log_err("ibm-950->u(MBCS) with Fallback did not match.\n");
}
@ -603,11 +603,11 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize )
UChar expectedFallbackFalse[]= { 0x5C6E, 0x5C6E, 0x81FC, 0x81FC, 0x8278, 0x8278};
if(!testConvertToUnicode(euc_tw_input, sizeof(euc_tw_input),
expectedUnicodeText, sizeof(expectedUnicodeText)/sizeof(expectedUnicodeText[0]),"euc-tw", TRUE, from_euc_tw_offs ))
expectedUnicodeText, UPRV_LENGTHOF(expectedUnicodeText),"euc-tw", TRUE, from_euc_tw_offs ))
log_err("from euc-tw->u with Fallback did not match.\n");
if(!testConvertToUnicode(euc_tw_input, sizeof(euc_tw_input),
expectedFallbackFalse, sizeof(expectedFallbackFalse)/sizeof(expectedFallbackFalse[0]),"euc-tw", FALSE, from_euc_tw_offs ))
expectedFallbackFalse, UPRV_LENGTHOF(expectedFallbackFalse),"euc-tw", FALSE, from_euc_tw_offs ))
log_err("from euc-tw->u with Fallback false did not match.\n");
@ -627,19 +627,19 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize )
int32_t to_euc_tw_offs [] = { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6,
6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12};
if(!testConvertFromUnicode(inputText, sizeof(inputText)/sizeof(inputText[0]),
if(!testConvertFromUnicode(inputText, UPRV_LENGTHOF(inputText),
expected_euc_tw, sizeof(expected_euc_tw), "euc-tw", TRUE, to_euc_tw_offs ))
log_err("u-> euc-tw with FallBack did not match.\n");
}
/*MBCS 1363*/
if(!testConvertFromUnicode(MBCSText1363, sizeof(MBCSText1363)/sizeof(MBCSText1363[0]),
if(!testConvertFromUnicode(MBCSText1363, UPRV_LENGTHOF(MBCSText1363),
expectedIBM1363, sizeof(expectedIBM1363), "ibm-1363", TRUE, toIBM1363Offs ))
log_err("u-> ibm-1363(MBCS) with FallBack did not match.\n");
if(!testConvertToUnicode(expectedIBM1363, sizeof(expectedIBM1363),
retrievedMBCSText1363, sizeof(retrievedMBCSText1363)/sizeof(retrievedMBCSText1363[0]),"ibm-1363", TRUE, fromIBM1363offs ))
retrievedMBCSText1363, UPRV_LENGTHOF(retrievedMBCSText1363),"ibm-1363", TRUE, fromIBM1363offs ))
log_err("ibm-1363->u(MBCS) with Fallback did not match.\n");
@ -657,13 +657,13 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize )
int32_t fromtest1Offs[] = { 0, 1, 2, 3, 3, 4,5};
/*from Unicode*/
if(!testConvertFromUnicode(unicodeInput, sizeof(unicodeInput)/sizeof(unicodeInput[0]),
if(!testConvertFromUnicode(unicodeInput, UPRV_LENGTHOF(unicodeInput),
expectedtest1, sizeof(expectedtest1), "@test1", TRUE, totest1Offs ))
log_err("u-> test1(MBCS conversion with single-byte) did not match.\n");
/*to Unicode*/
if(!testConvertToUnicode(test1input, sizeof(test1input),
expectedUnicode, sizeof(expectedUnicode)/sizeof(expectedUnicode[0]), "@test1", TRUE, fromtest1Offs ))
expectedUnicode, UPRV_LENGTHOF(expectedUnicode), "@test1", TRUE, fromtest1Offs ))
log_err("test1(MBCS conversion with single-byte) -> u did not match.\n");
}
@ -684,13 +684,13 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize )
int32_t fromtest3Offs[] = { 0, 1, 2, 3, 6, 6, 7, 7, 10, 13, 13, 16, 17};
/*from Unicode*/
if(!testConvertFromUnicode(unicodeInput, sizeof(unicodeInput)/sizeof(unicodeInput[0]),
if(!testConvertFromUnicode(unicodeInput, UPRV_LENGTHOF(unicodeInput),
expectedtest3, sizeof(expectedtest3), "@test3", TRUE, totest3Offs ))
log_err("u-> test3(MBCS conversion with three-byte) did not match.\n");
/*to Unicode*/
if(!testConvertToUnicode(test3input, sizeof(test3input),
expectedUnicode, sizeof(expectedUnicode)/sizeof(expectedUnicode[0]), "@test3", TRUE, fromtest3Offs ))
expectedUnicode, UPRV_LENGTHOF(expectedUnicode), "@test3", TRUE, fromtest3Offs ))
log_err("test3(MBCS conversion with three-byte) -> u did not match.\n");
}
@ -719,13 +719,13 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize )
{ 0, 1, 2, 3, 7, 7, 8, 8, 9, 9, 13, 17, 17, 21, 22,};
/*from Unicode*/
if(!testConvertFromUnicode(unicodeInput, sizeof(unicodeInput)/sizeof(unicodeInput[0]),
if(!testConvertFromUnicode(unicodeInput, UPRV_LENGTHOF(unicodeInput),
expectedtest4, sizeof(expectedtest4), "@test4", TRUE, totest4Offs ))
log_err("u-> test4(MBCS conversion with four-byte) did not match.\n");
/*to Unicode*/
if(!testConvertToUnicode(test4input, sizeof(test4input),
expectedUnicode, sizeof(expectedUnicode)/sizeof(expectedUnicode[0]), "@test4", TRUE, fromtest4Offs ))
expectedUnicode, UPRV_LENGTHOF(expectedUnicode), "@test4", TRUE, fromtest4Offs ))
log_err("test4(MBCS conversion with four-byte) -> u did not match.\n");
}
@ -738,12 +738,12 @@ static void TestConvertFallBackWithBufferSizes(int32_t outsize, int32_t insize )
const UChar expectedUnicode[] = {0x203e, 0x2014, 0xff5c, 0x004c, 0x5f5e, 0x223c };
int32_t fromtest1Offs[] = {1, 3, 5, 8, 10, 12 };
/*from Unicode*/
if(!testConvertFromUnicode(unicodeInput, sizeof(unicodeInput)/sizeof(unicodeInput[0]),
if(!testConvertFromUnicode(unicodeInput, UPRV_LENGTHOF(unicodeInput),
expectedtest1, sizeof(expectedtest1), "ibm-1371", TRUE, totest1Offs ))
log_err("u-> ibm-1371(MBCS conversion with single-byte) did not match.,\n");
/*to Unicode*/
if(!testConvertToUnicode(test1input, sizeof(test1input),
expectedUnicode, sizeof(expectedUnicode)/sizeof(expectedUnicode[0]), "ibm-1371", TRUE, fromtest1Offs ))
expectedUnicode, UPRV_LENGTHOF(expectedUnicode), "ibm-1371", TRUE, fromtest1Offs ))
log_err("ibm-1371(MBCS conversion with single-byte) -> u did not match.,\n");
}

232
icu4c/source/test/cintltst/ncnvtst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*****************************************************************************
@ -143,13 +143,13 @@ static void TestSurrogateBehaviour(){
#if !UCONFIG_NO_LEGACY_CONVERSION
/*SBCS*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-920", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> ibm-920 [UCNV_SBCS] not match.\n");
#endif
/*LATIN_1*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "LATIN_1", 0, TRUE, U_ZERO_ERROR ))
log_err("u-> LATIN_1 not match.\n");
@ -163,17 +163,17 @@ static void TestSurrogateBehaviour(){
int32_t offsets[] = {0x00, 0x00, 0x01, 0x01, 0x03, 0x03 };
/*DBCS*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] not match.\n");
/*MBCS*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] not match.\n");
}
@ -189,10 +189,10 @@ static void TestSurrogateBehaviour(){
int32_t offsets[] = {0,0,0,0,0,1,1,2,2,2,2,3,5 };
/*iso-2022-jp*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> not match.\n");
}
@ -219,10 +219,10 @@ static void TestSurrogateBehaviour(){
5, };
/*iso-2022-CN*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> not match.\n");
}
@ -249,10 +249,10 @@ static void TestSurrogateBehaviour(){
};
/*iso-2022-kr*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_DBCS] not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_DBCS] not match.\n");
}
@ -277,10 +277,10 @@ static void TestSurrogateBehaviour(){
7,};
/*hz*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> HZ not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> HZ not match.\n");
}
@ -299,30 +299,30 @@ static void TestSurrogateBehaviour(){
static const int32_t fromOffsets[] = { 0x0000, 0x0003, 0x0005, 0x0006, 0x0009, 0x0009, 0x000D };
/*UTF-8*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", offsets, TRUE, U_ZERO_ERROR ))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", 0, TRUE, U_ZERO_ERROR ))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", offsets, FALSE, U_ZERO_ERROR ))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", 0, FALSE, U_ZERO_ERROR ))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!convertToU(expected, sizeof(expected),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", 0, TRUE, U_ZERO_ERROR ))
sampleText, UPRV_LENGTHOF(sampleText), "UTF8", 0, TRUE, U_ZERO_ERROR ))
log_err("UTF8 -> u did not match.\n");
if(!convertToU(expected, sizeof(expected),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", 0, FALSE, U_ZERO_ERROR ))
sampleText, UPRV_LENGTHOF(sampleText), "UTF8", 0, FALSE, U_ZERO_ERROR ))
log_err("UTF8 -> u did not match.\n");
if(!convertToU(expected, sizeof(expected),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", fromOffsets, TRUE, U_ZERO_ERROR ))
sampleText, UPRV_LENGTHOF(sampleText), "UTF8", fromOffsets, TRUE, U_ZERO_ERROR ))
log_err("UTF8 ->u did not match.\n");
if(!convertToU(expected, sizeof(expected),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", fromOffsets, FALSE, U_ZERO_ERROR ))
sampleText, UPRV_LENGTHOF(sampleText), "UTF8", fromOffsets, FALSE, U_ZERO_ERROR ))
log_err("UTF8 -> u did not match.\n");
}
@ -340,26 +340,26 @@ static void TestErrorBehaviour(){
#if !UCONFIG_NO_LEGACY_CONVERSION
/*SBCS*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-920", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-920 [UCNV_SBCS] \n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected0, sizeof(expected0), "ibm-920", 0, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-920 [UCNV_SBCS] \n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-920", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-920 [UCNV_SBCS] did not match\n");
#endif
/*LATIN_1*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "LATIN_1", 0, TRUE, U_ZERO_ERROR))
log_err("u-> LATIN_1 is supposed to fail\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected0, sizeof(expected0), "LATIN_1", 0, FALSE, U_ZERO_ERROR))
log_err("u-> LATIN_1 is supposed to fail\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "LATIN_1", 0, TRUE, U_ZERO_ERROR))
log_err("u-> LATIN_1 did not match\n");
}
@ -386,57 +386,57 @@ static void TestErrorBehaviour(){
static const int32_t offsets4MBCS[] = { 0x00, 0x01, 0x01, 0x01, 0x02, 0x02 };
/*DBCS*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "ibm-1363", offsetsSUB, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", offsets, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] did not match \n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", offsets2, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] did not match \n");
/*MBCS*/
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", 0, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "ibm-1363", offsets3MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "ibm-1363", offsets3MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "IBM-eucJP", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> euc-jp [UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "IBM-eucJP", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> euc-jp [UCNV_MBCS] \n");
}
@ -456,27 +456,27 @@ static void TestErrorBehaviour(){
static const UChar sampleText4MBCS[] = { 0x0061, 0x4e00, 0xdc01};
static const uint8_t expected4MBCS[] = { 0x61, 0x1b, 0x24, 0x42, 0x30, 0x6c,0x1b,0x28,0x42,0x1a};
static const int32_t offsets4MBCS[] = { 0x00, 0x01, 0x01 ,0x01, 0x01, 0x01,0x02,0x02,0x02,0x02 };
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "iso-2022-jp", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", offsets, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-jp", offsets2, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-jp[UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-jp", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-jp", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "iso-2022-jp", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "iso-2022-jp", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
}
@ -500,34 +500,34 @@ static void TestErrorBehaviour(){
static const UChar sampleText4MBCS[] = { 0x0061, 0x4e00, 0xdc01};
static const uint8_t expected4MBCS[] = { 0x61, 0x1b, 0x24, 0x29, 0x41, 0x0e, 0x52, 0x3b, 0x0f, 0x1a };
static const int32_t offsets4MBCS[] = { 0x00, 0x01, 0x01 ,0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02 };
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "iso-2022-cn", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_MBCS] \n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", offsets, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-cn", offsets2, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-cn[UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-cn", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-cn", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "iso-2022-cn", offsets3MBCS, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-cn [UCNV_MBCS] \n");
if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "iso-2022-cn", offsets3MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn[UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "iso-2022-cn", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "iso-2022-cn", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_MBCS] \n");
}
@ -548,27 +548,27 @@ static void TestErrorBehaviour(){
static const uint8_t expected3MBCS[] = { 0x1b, 0x24, 0x29, 0x43, 0x51, 0x50, 0x1A };
static const int32_t offsets3MBCS[] = { -1, -1, -1, -1, 0x00, 0x01, 0x02, 0x02 };
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "iso-2022-kr", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_MBCS] \n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", offsets, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-kr", offsets2, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-kr[UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-kr", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-kr", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "iso-2022-kr", offsets3MBCS, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-kr [UCNV_MBCS] \n");
if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "iso-2022-kr", offsets3MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr[UCNV_MBCS] \n");
}
@ -592,34 +592,34 @@ static void TestErrorBehaviour(){
static const UChar sampleText4MBCS[] = { 0x0061, 0x4e00, 0xdc01};
static const uint8_t expected4MBCS[] = { 0x7e, 0x7d, 0x61, 0x7e, 0x7b, 0x52, 0x3b, 0x7e, 0x7d, 0x1a };
static const int32_t offsets4MBCS[] = { 0x00, 0x00, 0x00, 0x01, 0x01, 0x01 ,0x01, 0x02, 0x02, 0x02 };
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "HZ", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_MBCS] \n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", offsets, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "HZ", offsets2, TRUE, U_ZERO_ERROR))
log_err("u->HZ[UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "HZ", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "HZ", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_DBCS] did not match\n");
if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "HZ", offsets3MBCS, TRUE, U_ZERO_ERROR))
log_err("u->HZ [UCNV_MBCS] \n");
if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "HZ", offsets3MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> HZ[UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "HZ", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "HZ", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_MBCS] \n");
}
@ -636,10 +636,10 @@ static void TestToUnicodeErrorBehaviour()
const UChar expected[] = { 0x00a1 };
if(!convertToU(sampleText, sizeof(sampleText),
expected, sizeof(expected)/sizeof(expected[0]), "ibm-1363", 0, TRUE, U_AMBIGUOUS_ALIAS_WARNING ))
expected, UPRV_LENGTHOF(expected), "ibm-1363", 0, TRUE, U_AMBIGUOUS_ALIAS_WARNING ))
log_err("DBCS (ibm-1363)->Unicode did not match.\n");
if(!convertToU(sampleText, sizeof(sampleText),
expected, sizeof(expected)/sizeof(expected[0]), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING ))
expected, UPRV_LENGTHOF(expected), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING ))
log_err("DBCS (ibm-1363)->Unicode with flush = false did not match.\n");
}
log_verbose("Testing error conditions for SBCS\n");
@ -651,10 +651,10 @@ static void TestToUnicodeErrorBehaviour()
const UChar expected2[] = { 0x0073 };*/
if(!convertToU(sampleText, sizeof(sampleText),
expected, sizeof(expected)/sizeof(expected[0]), "ibm-1051", 0, TRUE, U_ZERO_ERROR ))
expected, UPRV_LENGTHOF(expected), "ibm-1051", 0, TRUE, U_ZERO_ERROR ))
log_err("SBCS (ibm-1051)->Unicode did not match.\n");
if(!convertToU(sampleText, sizeof(sampleText),
expected, sizeof(expected)/sizeof(expected[0]), "ibm-1051", 0, FALSE, U_ZERO_ERROR ))
expected, UPRV_LENGTHOF(expected), "ibm-1051", 0, FALSE, U_ZERO_ERROR ))
log_err("SBCS (ibm-1051)->Unicode with flush = false did not match.\n");
}
@ -808,17 +808,17 @@ static void TestRegressionUTF32(){
0x02, 0x02, 0x02, 0x02
};
if(!convertFromU(sampleBadStartSurrogate, sizeof(sampleBadStartSurrogate)/sizeof(sampleBadStartSurrogate[0]),
if(!convertFromU(sampleBadStartSurrogate, UPRV_LENGTHOF(sampleBadStartSurrogate),
expectedUTF32BE, sizeof(expectedUTF32BE), "UTF-32BE", offsetsUTF32, TRUE, U_ZERO_ERROR))
log_err("u->UTF-32BE\n");
if(!convertFromU(sampleBadEndSurrogate, sizeof(sampleBadEndSurrogate)/sizeof(sampleBadEndSurrogate[0]),
if(!convertFromU(sampleBadEndSurrogate, UPRV_LENGTHOF(sampleBadEndSurrogate),
expectedUTF32BE, sizeof(expectedUTF32BE), "UTF-32BE", offsetsUTF32, TRUE, U_ZERO_ERROR))
log_err("u->UTF-32BE\n");
if(!convertFromU(sampleBadStartSurrogate, sizeof(sampleBadStartSurrogate)/sizeof(sampleBadStartSurrogate[0]),
if(!convertFromU(sampleBadStartSurrogate, UPRV_LENGTHOF(sampleBadStartSurrogate),
expectedUTF32LE, sizeof(expectedUTF32LE), "UTF-32LE", offsetsUTF32, TRUE, U_ZERO_ERROR))
log_err("u->UTF-32LE\n");
if(!convertFromU(sampleBadEndSurrogate, sizeof(sampleBadEndSurrogate)/sizeof(sampleBadEndSurrogate[0]),
if(!convertFromU(sampleBadEndSurrogate, UPRV_LENGTHOF(sampleBadEndSurrogate),
expectedUTF32LE, sizeof(expectedUTF32LE), "UTF-32LE", offsetsUTF32, TRUE, U_ZERO_ERROR))
log_err("u->UTF-32LE\n");
}
@ -932,7 +932,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){
{ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0007, 0x000a, 0x000d };*/
/*UTF-8*/
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedUTF8, sizeof(expectedUTF8), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE, toUTF8Offs ,FALSE))
log_err("u-> UTF8 did not match.\n");
}
@ -948,7 +948,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){
0x61 };
int32_t offset[]= {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 4};
if(!testConvertFromU(inputTest, sizeof(inputTest)/sizeof(inputTest[0]),
if(!testConvertFromU(inputTest, UPRV_LENGTHOF(inputTest),
toIBM943, sizeof(toIBM943), "ibm-943",
(UConverterFromUCallback)UCNV_FROM_U_CALLBACK_ESCAPE, offset,FALSE))
log_err("u-> ibm-943 with subst with value did not match.\n");
@ -963,7 +963,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){
int32_t offsets1[] = { 0x0000, 0x0001, 0x0004, 0x0006};
if(!testConvertToU(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8", UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1,FALSE))
expected1, UPRV_LENGTHOF(expected1),"utf8", UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1,FALSE))
log_err("utf8->u with substitute did not match.\n");;
}
@ -980,7 +980,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){
int32_t fromIBM943Offs [] = { 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, 5};
if(!testConvertToU(sampleTxtToU, sizeof(sampleTxtToU),
IBM_943toUnicode, sizeof(IBM_943toUnicode)/sizeof(IBM_943toUnicode[0]),"ibm-943",
IBM_943toUnicode, UPRV_LENGTHOF(IBM_943toUnicode),"ibm-943",
(UConverterToUCallback)UCNV_TO_U_CALLBACK_ESCAPE, fromIBM943Offs,FALSE))
log_err("ibm-943->u with substitute with value did not match.\n");
@ -1225,7 +1225,7 @@ static UBool testConvertFromU( const UChar *source, int sourceLen, const uint8_
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = source + sourceLen;
@ -1399,7 +1399,7 @@ static UBool testConvertToU( const uint8_t *source, int sourcelen, const UChar *
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = src + sourcelen;
@ -1530,27 +1530,27 @@ static void TestResetBehaviour(void){
static const int32_t offsets1[] = { 0,2,4,6};
/*DBCS*/
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> ibm-1363 [UCNV_DBCS portion] not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> ibm-1363 [UCNV_DBCS portion] not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "ibm-1363",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
sampleText1, UPRV_LENGTHOF(sampleText1), "ibm-1363",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("ibm-1363 -> did not match.\n");
/*MBCS*/
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> ibm-1363 [UCNV_MBCS] not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> ibm-1363 [UCNV_MBCS] not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "ibm-1363",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
sampleText1, UPRV_LENGTHOF(sampleText1), "ibm-1363",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("ibm-1363 -> did not match.\n");
@ -1573,15 +1573,15 @@ static void TestResetBehaviour(void){
static const int32_t offsets1[] = { 3,5,10,11,12};
/*iso-2022-jp*/
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "iso-2022-jp",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
sampleText1, UPRV_LENGTHOF(sampleText1), "iso-2022-jp",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("iso-2022-jp -> did not match.\n");
@ -1618,15 +1618,15 @@ static void TestResetBehaviour(void){
static const int32_t offsets1[] = { 5,7,13,16,17};
/*iso-2022-CN*/
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "iso-2022-cn",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
sampleText1, UPRV_LENGTHOF(sampleText1), "iso-2022-cn",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("iso-2022-cn -> did not match.\n");
}
@ -1667,14 +1667,14 @@ static void TestResetBehaviour(void){
};
/*iso-2022-kr*/
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> iso-2022-kr [UCNV_DBCS] not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> iso-2022-kr [UCNV_DBCS] not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "iso-2022-kr",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
sampleText1, UPRV_LENGTHOF(sampleText1), "iso-2022-kr",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("iso-2022-kr -> did not match.\n");
}
@ -1711,14 +1711,14 @@ static void TestResetBehaviour(void){
};
/*hz*/
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", UCNV_FROM_U_CALLBACK_SUBSTITUTE,NULL , TRUE))
log_err("u-> not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "hz",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
sampleText1, UPRV_LENGTHOF(sampleText1), "hz",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("hz -> did not match.\n");
}
@ -1737,29 +1737,29 @@ static void TestResetBehaviour(void){
static const int32_t fromOffsets[] = { 0x0000, 0x0003, 0x0005, 0x0006, 0x0009, 0x0009, 0x000D };
/*UTF-8*/
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE,NULL , TRUE))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE,NULL , TRUE))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!testConvertToU(expected, sizeof(expected),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8",UCNV_TO_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
sampleText, UPRV_LENGTHOF(sampleText), "UTF8",UCNV_TO_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("UTF8 -> did not match.\n");
if(!testConvertToU(expected, sizeof(expected),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", UCNV_TO_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
sampleText, UPRV_LENGTHOF(sampleText), "UTF8", UCNV_TO_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("UTF8 -> did not match.\n");
if(!testConvertToU(expected, sizeof(expected),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8",UCNV_TO_U_CALLBACK_SUBSTITUTE , fromOffsets, TRUE))
sampleText, UPRV_LENGTHOF(sampleText), "UTF8",UCNV_TO_U_CALLBACK_SUBSTITUTE , fromOffsets, TRUE))
log_err("UTF8 -> did not match.\n");
if(!testConvertToU(expected, sizeof(expected),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", UCNV_TO_U_CALLBACK_SUBSTITUTE , fromOffsets, TRUE))
sampleText, UPRV_LENGTHOF(sampleText), "UTF8", UCNV_TO_U_CALLBACK_SUBSTITUTE , fromOffsets, TRUE))
log_err("UTF8 -> did not match.\n");
}

158
icu4c/source/test/cintltst/nucnvtst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@ -403,7 +403,7 @@ static ETestConvertResult testConvertFromU( const UChar *source, int sourceLen,
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = source + sourceLen;
@ -561,7 +561,7 @@ static ETestConvertResult testConvertToU( const uint8_t *source, int sourcelen,
targ = junkout;
offs = junokout;
realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = src + sourcelen;
@ -833,7 +833,7 @@ static void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize )
/*UTF-8*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedUTF8, sizeof(expectedUTF8), "UTF8", toUTF8Offs,FALSE );
log_verbose("Test surrogate behaviour for UTF8\n");
@ -844,7 +844,7 @@ static void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize )
0xef, 0xbf, 0xbd
};
static const int32_t offsets[]={ 0, 0, 0, 1, 1, 1, 1, 3, 3, 3 };
testConvertFromU(testinput, sizeof(testinput)/sizeof(testinput[0]),
testConvertFromU(testinput, UPRV_LENGTHOF(testinput),
expectedUTF8test2, sizeof(expectedUTF8test2), "UTF8", offsets,FALSE );
@ -852,47 +852,47 @@ static void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize )
#if !UCONFIG_NO_LEGACY_CONVERSION && defined(U_ENABLE_GENERIC_ISO_2022)
/*ISO-2022*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedISO2022, sizeof(expectedISO2022), "ISO_2022", toISO2022Offs,FALSE );
#endif
/*UTF16 LE*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedUTF16LE, sizeof(expectedUTF16LE), "utf-16le", toUTF16LEOffs,FALSE );
/*UTF16 BE*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedUTF16BE, sizeof(expectedUTF16BE), "utf-16be", toUTF16BEOffs,FALSE );
/*UTF32 LE*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedUTF32LE, sizeof(expectedUTF32LE), "utf-32le", toUTF32LEOffs,FALSE );
/*UTF32 BE*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedUTF32BE, sizeof(expectedUTF32BE), "utf-32be", toUTF32BEOffs,FALSE );
/*LATIN_1*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedLATIN1, sizeof(expectedLATIN1), "LATIN_1", toLATIN1Offs,FALSE );
#if !UCONFIG_NO_LEGACY_CONVERSION
/*EBCDIC_STATEFUL*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedIBM930, sizeof(expectedIBM930), "ibm-930", toIBM930Offs,FALSE );
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedISO88593, sizeof(expectedISO88593), "iso-8859-3", toISO88593Offs,FALSE );
/*MBCS*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedIBM943, sizeof(expectedIBM943), "ibm-943", toIBM943Offs,FALSE );
/*DBCS*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedIBM9027, sizeof(expectedIBM9027), "@ibm9027", toIBM9027Offs,FALSE );
/*SBCS*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedIBM920, sizeof(expectedIBM920), "ibm-920", toIBM920Offs,FALSE );
/*SBCS*/
testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedISO88593, sizeof(expectedISO88593), "iso-8859-3", toISO88593Offs,FALSE );
#endif
@ -901,51 +901,51 @@ static void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize )
/*UTF-8*/
testConvertToU(expectedUTF8, sizeof(expectedUTF8),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "utf8", fmUTF8Offs,FALSE);
sampleText, UPRV_LENGTHOF(sampleText), "utf8", fmUTF8Offs,FALSE);
#if !UCONFIG_NO_LEGACY_CONVERSION && defined(U_ENABLE_GENERIC_ISO_2022)
/*ISO-2022*/
testConvertToU(expectedISO2022, sizeof(expectedISO2022),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "ISO_2022", fmISO2022Offs,FALSE);
sampleText, UPRV_LENGTHOF(sampleText), "ISO_2022", fmISO2022Offs,FALSE);
#endif
/*UTF16 LE*/
testConvertToU(expectedUTF16LE, sizeof(expectedUTF16LE),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "utf-16le", fmUTF16LEOffs,FALSE);
sampleText, UPRV_LENGTHOF(sampleText), "utf-16le", fmUTF16LEOffs,FALSE);
/*UTF16 BE*/
testConvertToU(expectedUTF16BE, sizeof(expectedUTF16BE),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "utf-16be", fmUTF16BEOffs,FALSE);
sampleText, UPRV_LENGTHOF(sampleText), "utf-16be", fmUTF16BEOffs,FALSE);
/*UTF32 LE*/
testConvertToU(expectedUTF32LE, sizeof(expectedUTF32LE),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "utf-32le", fmUTF32LEOffs,FALSE);
sampleText, UPRV_LENGTHOF(sampleText), "utf-32le", fmUTF32LEOffs,FALSE);
/*UTF32 BE*/
testConvertToU(expectedUTF32BE, sizeof(expectedUTF32BE),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "utf-32be", fmUTF32BEOffs,FALSE);
sampleText, UPRV_LENGTHOF(sampleText), "utf-32be", fmUTF32BEOffs,FALSE);
#if !UCONFIG_NO_LEGACY_CONVERSION
/*EBCDIC_STATEFUL*/
testConvertToU(expectedIBM930, sizeof(expectedIBM930), sampleTextRoundTripUnmappable,
sizeof(sampleTextRoundTripUnmappable)/sizeof(sampleTextRoundTripUnmappable[0]), "ibm-930", fmIBM930Offs,FALSE);
UPRV_LENGTHOF(sampleTextRoundTripUnmappable), "ibm-930", fmIBM930Offs,FALSE);
/*MBCS*/
testConvertToU(expectedIBM943, sizeof(expectedIBM943),sampleTextRoundTripUnmappable,
sizeof(sampleTextRoundTripUnmappable)/sizeof(sampleTextRoundTripUnmappable[0]), "ibm-943", fmIBM943Offs,FALSE);
UPRV_LENGTHOF(sampleTextRoundTripUnmappable), "ibm-943", fmIBM943Offs,FALSE);
#endif
/* Try it again to make sure it still works */
testConvertToU(expectedUTF16LE, sizeof(expectedUTF16LE),
sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "utf-16le", fmUTF16LEOffs,FALSE);
sampleText, UPRV_LENGTHOF(sampleText), "utf-16le", fmUTF16LEOffs,FALSE);
#if !UCONFIG_NO_LEGACY_CONVERSION
testConvertToU(expectedMaltese913, sizeof(expectedMaltese913),
malteseUChars, sizeof(malteseUChars)/sizeof(malteseUChars[0]), "latin3", NULL,FALSE);
malteseUChars, UPRV_LENGTHOF(malteseUChars), "latin3", NULL,FALSE);
testConvertFromU(malteseUChars, sizeof(malteseUChars)/sizeof(malteseUChars[0]),
testConvertFromU(malteseUChars, UPRV_LENGTHOF(malteseUChars),
expectedMaltese913, sizeof(expectedMaltese913), "iso-8859-3", NULL,FALSE );
/*LMBCS*/
testConvertFromU(LMBCSUChars, sizeof(LMBCSUChars)/sizeof(LMBCSUChars[0]),
testConvertFromU(LMBCSUChars, UPRV_LENGTHOF(LMBCSUChars),
expectedLMBCS, sizeof(expectedLMBCS), "LMBCS-1", toLMBCSOffs,FALSE );
testConvertToU(expectedLMBCS, sizeof(expectedLMBCS),
LMBCSUChars, sizeof(LMBCSUChars)/sizeof(LMBCSUChars[0]), "LMBCS-1", fmLMBCSOffs,FALSE);
LMBCSUChars, UPRV_LENGTHOF(LMBCSUChars), "LMBCS-1", fmLMBCSOffs,FALSE);
#endif
/* UTF-7 examples are mostly from http://www.imc.org/rfc2152 */
@ -1133,7 +1133,7 @@ static void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize )
0, 1, 5, 6, 7, 12, 17, 17, 21, 23, 24, 28
};
testConvertToU(utf8, sizeof(utf8),
utf8Expected, sizeof(utf8Expected)/sizeof(utf8Expected[0]), "utf-8", utf8Offsets ,FALSE);
utf8Expected, UPRV_LENGTHOF(utf8Expected), "utf-8", utf8Offsets ,FALSE);
}
@ -1185,8 +1185,8 @@ static void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize )
};
testConvertToU(utf32, sizeof(utf32),
utf32Expected, sizeof(utf32Expected)/sizeof(utf32Expected[0]), "utf-32be", utf32Offsets ,FALSE);
testConvertFromU(utf32Expected, sizeof(utf32Expected)/sizeof(utf32Expected[0]),
utf32Expected, UPRV_LENGTHOF(utf32Expected), "utf-32be", utf32Offsets ,FALSE);
testConvertFromU(utf32Expected, UPRV_LENGTHOF(utf32Expected),
utf32ExpectedBack, sizeof(utf32ExpectedBack), "utf-32be", utf32OffsetsBack, FALSE);
}
@ -1238,8 +1238,8 @@ static void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize )
8,8,8,8
};
testConvertToU(utf32, sizeof(utf32),
utf32Expected, sizeof(utf32Expected)/sizeof(utf32Expected[0]), "utf-32le", utf32Offsets,FALSE );
testConvertFromU(utf32Expected, sizeof(utf32Expected)/sizeof(utf32Expected[0]),
utf32Expected, UPRV_LENGTHOF(utf32Expected), "utf-32le", utf32Offsets,FALSE );
testConvertFromU(utf32Expected, UPRV_LENGTHOF(utf32Expected),
utf32ExpectedBack, sizeof(utf32ExpectedBack), "utf-32le", utf32OffsetsBack, FALSE);
}
}
@ -1276,7 +1276,7 @@ static void TestCoverageMBCS(){
int32_t totest1Offs[] = { 0, 1, 2, 3, 5, };
/*from Unicode*/
testConvertFromU(unicodeInput, sizeof(unicodeInput)/sizeof(unicodeInput[0]),
testConvertFromU(unicodeInput, UPRV_LENGTHOF(unicodeInput),
expectedtest1, sizeof(expectedtest1), "@test1", totest1Offs,FALSE );
}
@ -1294,12 +1294,12 @@ static void TestCoverageMBCS(){
int32_t fromtest3Offs[] = { 0, 1, 2, 3, 6, 6, 7, 7, 10 };
/*from Unicode*/
testConvertFromU(unicodeInput, sizeof(unicodeInput)/sizeof(unicodeInput[0]),
testConvertFromU(unicodeInput, UPRV_LENGTHOF(unicodeInput),
expectedtest3, sizeof(expectedtest3), "@test3", totest3Offs,FALSE );
/*to Unicode*/
testConvertToU(test3input, sizeof(test3input),
expectedUnicode, sizeof(expectedUnicode)/sizeof(expectedUnicode[0]), "@test3", fromtest3Offs ,FALSE);
expectedUnicode, UPRV_LENGTHOF(expectedUnicode), "@test3", fromtest3Offs ,FALSE);
}
@ -1317,12 +1317,12 @@ static void TestCoverageMBCS(){
static const int32_t fromtest4Offs[] = { 0, 1, 2, 3, 7, 7, 8, 8, 12,};
/*from Unicode*/
testConvertFromU(unicodeInput, sizeof(unicodeInput)/sizeof(unicodeInput[0]),
testConvertFromU(unicodeInput, UPRV_LENGTHOF(unicodeInput),
expectedtest4, sizeof(expectedtest4), "@test4", totest4Offs,FALSE );
/*to Unicode*/
testConvertToU(test4input, sizeof(test4input),
expectedUnicode, sizeof(expectedUnicode)/sizeof(expectedUnicode[0]), "@test4", fromtest4Offs,FALSE );
expectedUnicode, UPRV_LENGTHOF(expectedUnicode), "@test4", fromtest4Offs,FALSE );
}
#if 0
@ -3099,7 +3099,7 @@ TestHZ() {
uBuf = (UChar*)malloc(uBufSize * sizeof(UChar)*5);
cBuf =(char*)malloc(uBufSize * sizeof(char) * 5);
uSource = (const UChar*)in;
uSourceLimit=(const UChar*)in + (sizeof(in)/sizeof(in[0]));
uSourceLimit=(const UChar*)in + UPRV_LENGTHOF(in);
cTarget = cBuf;
cTargetLimit = cBuf +uBufSize*5;
uTarget = uBuf;
@ -3128,9 +3128,9 @@ TestHZ() {
test++;
}
TestGetNextUChar2022(cnv, cBuf, cTarget, in, "HZ encoding");
TestSmallTargetBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestToAndFromUChars(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallTargetBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestToAndFromUChars(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestJitterbug930("csISO2022JP");
ucnv_close(cnv);
free(offsets);
@ -3318,7 +3318,7 @@ TestISO_2022_JP() {
uBuf = (UChar*)malloc(uBufSize * sizeof(UChar)*5);
cBuf =(char*)malloc(uBufSize * sizeof(char) * 5);
uSource = (const UChar*)in;
uSourceLimit=(const UChar*)in + (sizeof(in)/sizeof(in[0]));
uSourceLimit=(const UChar*)in + UPRV_LENGTHOF(in);
cTarget = cBuf;
cTargetLimit = cBuf +uBufSize*5;
uTarget = uBuf;
@ -3348,10 +3348,10 @@ TestISO_2022_JP() {
test++;
}
TestSmallTargetBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallTargetBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestGetNextUChar2022(cnv, cBuf, cTarget, in, "ISO-2022-JP encoding");
TestToAndFromUChars(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestToAndFromUChars(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestJitterbug930("csISO2022JP");
ucnv_close(cnv);
free(uBuf);
@ -3748,7 +3748,7 @@ TestSCSU() {
"\\uf95b\\u2458\\u2468\\u0e20\\uf51b\\ue36e\\ubfc1\\u0080\\u02dd\\uf1b5\\u0cf3\\u6059\\u7489",
};
int i=0;
for(;i<sizeof(fTestCases)/sizeof(*fTestCases);i++){
for(;i<UPRV_LENGTHOF(fTestCases);i++){
const char* cSrc = fTestCases[i];
UErrorCode status = U_ZERO_ERROR;
int32_t cSrcLen,srcLen;
@ -3860,7 +3860,7 @@ TestISO_2022_JP_1() {
uBuf = (UChar*)malloc(uBufSize * sizeof(UChar)*5);
cBuf =(char*)malloc(uBufSize * sizeof(char) * 5);
uSource = (const UChar*)in;
uSourceLimit=(const UChar*)in + (sizeof(in)/sizeof(in[0]));
uSourceLimit=(const UChar*)in + UPRV_LENGTHOF(in);
cTarget = cBuf;
cTargetLimit = cBuf +uBufSize*5;
uTarget = uBuf;
@ -3895,8 +3895,8 @@ TestISO_2022_JP_1() {
static const uint8_t source2[]={0x0e,0x24,0x053};
TestNextUCharError(cnv, (const char*)source2, (const char*)source2+sizeof(source2), U_ZERO_ERROR, "an invalid character [ISO-2022-JP-1]");
}
TestSmallTargetBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallTargetBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
ucnv_close(cnv);
free(uBuf);
free(cBuf);
@ -3950,7 +3950,7 @@ TestISO_2022_JP_2() {
uBuf = (UChar*)malloc(uBufSize * sizeof(UChar)*5);
cBuf =(char*)malloc(uBufSize * sizeof(char) * 5);
uSource = (const UChar*)in;
uSourceLimit=(const UChar*)in + (sizeof(in)/sizeof(in[0]));
uSourceLimit=(const UChar*)in + UPRV_LENGTHOF(in);
cTarget = cBuf;
cTargetLimit = cBuf +uBufSize*5;
uTarget = uBuf;
@ -3978,9 +3978,9 @@ TestISO_2022_JP_2() {
uSource++;
test++;
}
TestSmallTargetBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestToAndFromUChars(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallTargetBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestToAndFromUChars(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
/*Test for the condition where there is an invalid character*/
ucnv_reset(cnv);
{
@ -4027,7 +4027,7 @@ TestISO_2022_KR() {
uBuf = (UChar*)malloc(uBufSize * sizeof(UChar)*5);
cBuf =(char*)malloc(uBufSize * sizeof(char) * 5);
uSource = (const UChar*)in;
uSourceLimit=(const UChar*)in + (sizeof(in)/sizeof(in[0]));
uSourceLimit=(const UChar*)in + UPRV_LENGTHOF(in);
cTarget = cBuf;
cTargetLimit = cBuf +uBufSize*5;
uTarget = uBuf;
@ -4055,9 +4055,9 @@ TestISO_2022_KR() {
test++;
}
TestGetNextUChar2022(cnv, cBuf, cTarget, in, "ISO-2022-KR encoding");
TestSmallTargetBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestToAndFromUChars(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallTargetBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestToAndFromUChars(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestJitterbug930("csISO2022KR");
/*Test for the condition where there is an invalid character*/
ucnv_reset(cnv);
@ -4106,7 +4106,7 @@ TestISO_2022_KR_1() {
uBuf = (UChar*)malloc(uBufSize * sizeof(UChar)*5);
cBuf =(char*)malloc(uBufSize * sizeof(char) * 5);
uSource = (const UChar*)in;
uSourceLimit=(const UChar*)in + (sizeof(in)/sizeof(in[0]));
uSourceLimit=(const UChar*)in + UPRV_LENGTHOF(in);
cTarget = cBuf;
cTargetLimit = cBuf +uBufSize*5;
uTarget = uBuf;
@ -4135,10 +4135,10 @@ TestISO_2022_KR_1() {
}
ucnv_reset(cnv);
TestGetNextUChar2022(cnv, cBuf, cTarget, in, "ISO-2022-KR encoding");
TestSmallTargetBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallTargetBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
ucnv_reset(cnv);
TestToAndFromUChars(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestToAndFromUChars(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
/*Test for the condition where there is an invalid character*/
ucnv_reset(cnv);
{
@ -4255,11 +4255,11 @@ TestJIS(){
};
testConvertToU(sampleTextJIS,sizeof(sampleTextJIS),expectedISO2022JIS,
sizeof(expectedISO2022JIS)/sizeof(expectedISO2022JIS[0]),"JIS", toISO2022JISOffs,TRUE);
UPRV_LENGTHOF(expectedISO2022JIS),"JIS", toISO2022JISOffs,TRUE);
testConvertToU(sampleTextJIS7,sizeof(sampleTextJIS7),expectedISO2022JIS7,
sizeof(expectedISO2022JIS7)/sizeof(expectedISO2022JIS7[0]),"JIS7", toISO2022JIS7Offs,TRUE);
UPRV_LENGTHOF(expectedISO2022JIS7),"JIS7", toISO2022JIS7Offs,TRUE);
testConvertToU(sampleTextJIS8,sizeof(sampleTextJIS8),expectedISO2022JIS8,
sizeof(expectedISO2022JIS8)/sizeof(expectedISO2022JIS8[0]),"JIS8", toISO2022JIS8Offs,TRUE);
UPRV_LENGTHOF(expectedISO2022JIS8),"JIS8", toISO2022JIS8Offs,TRUE);
}
}
@ -4412,7 +4412,7 @@ TestISO_2022_CN_EXT() {
uBuf = (UChar*)malloc(uBufSize * sizeof(UChar)*5);
cBuf =(char*)malloc(uBufSize * sizeof(char) * 10);
uSource = (const UChar*)in;
uSourceLimit=(const UChar*)in + (sizeof(in)/sizeof(in[0]));
uSourceLimit=(const UChar*)in + UPRV_LENGTHOF(in);
cTarget = cBuf;
cTargetLimit = cBuf +uBufSize*5;
uTarget = uBuf;
@ -4442,8 +4442,8 @@ TestISO_2022_CN_EXT() {
uSource++;
test++;
}
TestSmallTargetBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallTargetBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
/*Test for the condition where there is an invalid character*/
ucnv_reset(cnv);
{
@ -4511,7 +4511,7 @@ TestISO_2022_CN() {
uBuf = (UChar*)malloc(uBufSize * sizeof(UChar)*5);
cBuf =(char*)malloc(uBufSize * sizeof(char) * 10);
uSource = (const UChar*)in;
uSourceLimit=(const UChar*)in + (sizeof(in)/sizeof(in[0]));
uSourceLimit=(const UChar*)in + UPRV_LENGTHOF(in);
cTarget = cBuf;
cTargetLimit = cBuf +uBufSize*5;
uTarget = uBuf;
@ -4542,9 +4542,9 @@ TestISO_2022_CN() {
test++;
}
TestGetNextUChar2022(cnv, cBuf, cTarget, in, "ISO-2022-CN encoding");
TestSmallTargetBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestToAndFromUChars(in,(const UChar*)in + (sizeof(in)/sizeof(in[0])),cnv);
TestSmallTargetBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestSmallSourceBuffer(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestToAndFromUChars(in,(const UChar*)in + UPRV_LENGTHOF(in),cnv);
TestJitterbug930("csISO2022CN");
/*Test for the condition where there is an invalid character*/
ucnv_reset(cnv);
@ -4915,7 +4915,7 @@ TestLMBCS() {
/* last 'offset' in expected results is just the final size.
(Makes other tests easier). Compensate here: */
off[(sizeof(offsets)/sizeof(offsets[0]))-1] = sizeof(pszLMBCS);
off[UPRV_LENGTHOF(offsets)-1] = sizeof(pszLMBCS);
@ -4998,8 +4998,8 @@ TestLMBCS() {
/* 0192 (hook) converts to both group 3 & group 1. input locale should differentiate */
ucnv_fromUnicode (cnv16he,
&pLMBCSIn, (pLMBCSIn + sizeof(lmbcsString)/sizeof(lmbcsString[0])),
&pUniOut, pUniOut + sizeof(uniString)/sizeof(uniString[0]),
&pLMBCSIn, (pLMBCSIn + UPRV_LENGTHOF(lmbcsString)),
&pUniOut, pUniOut + UPRV_LENGTHOF(uniString),
NULL, 1, &errorCode);
if (lmbcsString[0] != 0x3 || lmbcsString[1] != 0x83)
@ -5010,8 +5010,8 @@ TestLMBCS() {
pLMBCSIn= (char *)lmbcsString;
pUniOut = uniString;
ucnv_fromUnicode (cnv01us,
&pLMBCSIn, (const char *)(lmbcsString + sizeof(lmbcsString)/sizeof(lmbcsString[0])),
&pUniOut, pUniOut + sizeof(uniString)/sizeof(uniString[0]),
&pLMBCSIn, (const char *)(lmbcsString + UPRV_LENGTHOF(lmbcsString)),
&pUniOut, pUniOut + UPRV_LENGTHOF(uniString),
NULL, 1, &errorCode);
if (lmbcsString[0] != 0x9F)

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1998-2012, International Business Machines Corporation and
* Copyright (c) 1998-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*
@ -565,7 +565,7 @@ static void toolutil_findBasename(void)
""
},
};
int32_t count=(sizeof(testCases)/sizeof(testCases[0]));
int32_t count=UPRV_LENGTHOF(testCases);
int32_t i;
@ -661,7 +661,7 @@ static void toolutil_findDirname(void)
""
}
};
int32_t count=(sizeof(testCases)/sizeof(testCases[0]));
int32_t count=UPRV_LENGTHOF(testCases);
log_verbose("Testing findDirname()\n");
for(i=0;i<count;i++) {

5
icu4c/source/test/cintltst/spreptst.c
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2014, International Business Machines
* Copyright (C) 2003-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -23,6 +23,7 @@
#include "unicode/usprep.h"
#include "cstring.h"
#include "cintltst.h"
#include "cmemory.h"
#include "nfsprep.h"
void addUStringPrepTest(TestNode** root);
@ -317,7 +318,7 @@ static void Test_nfs4_cis_prep(void){
return;
}
for(i=0;i< (int32_t)(sizeof(conformanceTestCases)/sizeof(conformanceTestCases[0]));i++){
for(i=0;i< UPRV_LENGTHOF(conformanceTestCases);i++){
const char* src = conformanceTestCases[i].in;
UErrorCode status = U_ZERO_ERROR;
UParseError parseError;

21
icu4c/source/test/cintltst/stdnmtst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2000-2009, International Business Machines Corporation and
* Copyright (c) 2000-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*
@ -15,11 +15,10 @@
#include "unicode/ucnv.h"
#include "unicode/ustring.h"
#include "cmemory.h"
#include "cstring.h"
#include "cintltst.h"
#define ARRAY_SIZE(array) (int32_t)(sizeof array / sizeof array[0])
static void TestStandardName(void);
static void TestStandardNames(void);
static void TestCanonicalName(void);
@ -244,7 +243,7 @@ static UBool doTestUCharNames(const char *name, const char *standard, const char
UChar testName[256];
int32_t len;
const UChar *enumName = uenum_unext(myEnum, &len, &err);
u_uastrncpy(testName, expected[idx], sizeof(testName)/sizeof(testName[0]));
u_uastrncpy(testName, expected[idx], UPRV_LENGTHOF(testName));
if (u_strcmp(enumName, testName) != 0 || U_FAILURE(err)
|| len != (int32_t)uprv_strlen(expected[idx]))
{
@ -289,20 +288,20 @@ static void TestStandardNames()
"ISO-2022-KR",
};
doTestNames("ASCII", "IANA", asciiIANA, ARRAY_SIZE(asciiIANA));
doTestNames("US-ASCII", "IANA", asciiIANA, ARRAY_SIZE(asciiIANA));
doTestNames("ASCII", "MIME", asciiMIME, ARRAY_SIZE(asciiMIME));
doTestNames("ascii", "mime", asciiMIME, ARRAY_SIZE(asciiMIME));
doTestNames("ASCII", "IANA", asciiIANA, UPRV_LENGTHOF(asciiIANA));
doTestNames("US-ASCII", "IANA", asciiIANA, UPRV_LENGTHOF(asciiIANA));
doTestNames("ASCII", "MIME", asciiMIME, UPRV_LENGTHOF(asciiMIME));
doTestNames("ascii", "mime", asciiMIME, UPRV_LENGTHOF(asciiMIME));
doTestNames("ASCII", "crazy", asciiMIME, -1);
doTestNames("crazy", "MIME", asciiMIME, -1);
doTestNames("LMBCS-1", "MIME", asciiMIME, 0);
doTestNames("ISO_2022,locale=ko,version=0", "MIME", iso2022MIME, ARRAY_SIZE(iso2022MIME));
doTestNames("csiso2022kr", "MIME", iso2022MIME, ARRAY_SIZE(iso2022MIME));
doTestNames("ISO_2022,locale=ko,version=0", "MIME", iso2022MIME, UPRV_LENGTHOF(iso2022MIME));
doTestNames("csiso2022kr", "MIME", iso2022MIME, UPRV_LENGTHOF(iso2022MIME));
log_verbose(" Testing unext()\n");
doTestUCharNames("ASCII", "IANA", asciiIANA, ARRAY_SIZE(asciiIANA));
doTestUCharNames("ASCII", "IANA", asciiIANA, UPRV_LENGTHOF(asciiIANA));
}

16
icu4c/source/test/cintltst/trietest.c
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2001-2011, International Business Machines
* Copyright (C) 2001-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -32,8 +32,6 @@
#define u_errorName(errorCode) "some error code"
#endif
#define ARRAY_LENGTH(array) (sizeof(array)/sizeof(array[0]))
/* Values for setting possibly overlapping, out-of-order ranges of values */
typedef struct SetRange {
UChar32 start, limit;
@ -801,14 +799,14 @@ checkRanges3[]={
static void
TrieTest(void) {
testTrieRanges4("set1",
setRanges1, ARRAY_LENGTH(setRanges1),
checkRanges1, ARRAY_LENGTH(checkRanges1));
setRanges1, UPRV_LENGTHOF(setRanges1),
checkRanges1, UPRV_LENGTHOF(checkRanges1));
testTrieRanges4("set2-overlap",
setRanges2, ARRAY_LENGTH(setRanges2),
checkRanges2, ARRAY_LENGTH(checkRanges2));
setRanges2, UPRV_LENGTHOF(setRanges2),
checkRanges2, UPRV_LENGTHOF(checkRanges2));
testTrieRanges4("set3-initial-9",
setRanges3, ARRAY_LENGTH(setRanges3),
checkRanges3, ARRAY_LENGTH(checkRanges3));
setRanges3, UPRV_LENGTHOF(setRanges3),
checkRanges3, UPRV_LENGTHOF(checkRanges3));
}
/* test utrie_unserializeDummy() -------------------------------------------- */

13
icu4c/source/test/cintltst/ucsdetst.c
View file

@ -1,6 +1,6 @@
/*
****************************************************************************
* Copyright (c) 2005-2009, International Business Machines Corporation and *
* Copyright (c) 2005-2016, International Business Machines Corporation and *
* others. All Rights Reserved. *
****************************************************************************
*/
@ -12,12 +12,11 @@
#include "unicode/ustring.h"
#include "cintltst.h"
#include "cmemory.h"
#include <stdlib.h>
#include <string.h>
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
#define NEW_ARRAY(type,count) (type *) malloc((count) * sizeof(type))
#define DELETE_ARRAY(array) free(array)
@ -166,7 +165,7 @@ static void TestUTF16(void)
0x0020, 0x0627, 0x0644, 0x062d, 0x0627, 0x0633, 0x0648, 0x0628,
0x0020, 0x002b, 0x0020, 0x0627, 0x0646, 0x062a, 0x0631, 0x0646,
0x064a, 0x062a, 0x0000};
int32_t beLength = 0, leLength = 0, cLength = ARRAY_SIZE(chars);
int32_t beLength = 0, leLength = 0, cLength = UPRV_LENGTHOF(chars);
char *beBytes = extractBytes(chars, cLength, "UTF-16BE", &beLength);
char *leBytes = extractBytes(chars, cLength, "UTF-16LE", &leLength);
UCharsetDetector *csd = ucsdet_open(&status);
@ -400,7 +399,7 @@ static void TestBufferOverflow(void) {
goto bail;
}
for (idx = 0; idx < ARRAY_SIZE(testStrings); idx++) {
for (idx = 0; idx < UPRV_LENGTHOF(testStrings); idx++) {
ucsdet_setText(csd, testStrings[idx], -1, &status);
match = ucsdet_detect(csd, &status);
@ -470,7 +469,7 @@ static void TestIBM424(void)
0x0000
};
int32_t bLength = 0, brLength = 0, cLength = ARRAY_SIZE(chars), crLength = ARRAY_SIZE(chars_reverse);
int32_t bLength = 0, brLength = 0, cLength = UPRV_LENGTHOF(chars), crLength = UPRV_LENGTHOF(chars_reverse);
char *bytes = extractBytes(chars, cLength, "IBM424", &bLength);
char *bytes_r = extractBytes(chars_reverse, crLength, "IBM424", &brLength);
@ -548,7 +547,7 @@ static void TestIBM420(void)
0x0000,
};
int32_t bLength = 0, brLength = 0, cLength = ARRAY_SIZE(chars), crLength = ARRAY_SIZE(chars_reverse);
int32_t bLength = 0, brLength = 0, cLength = UPRV_LENGTHOF(chars), crLength = UPRV_LENGTHOF(chars_reverse);
char *bytes = extractBytes(chars, cLength, "IBM420", &bLength);
char *bytes_r = extractBytes(chars_reverse, crLength, "IBM420", &brLength);

8
icu4c/source/test/cintltst/udatatst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1998-2014, International Business Machines Corporation and
* Copyright (c) 1998-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*
@ -168,7 +168,7 @@ static void TestUDataOpen(){
{
int i;
log_verbose("Testing udata_open() on %s\n", icuDataFilePath);
for(i=0; i<sizeof(memMap)/sizeof(memMap[0]); i++){
for(i=0; i<UPRV_LENGTHOF(memMap); i++){
/* lots_of_mallocs(); */
status=U_ZERO_ERROR;
result=udata_open(path, memMap[i][1], memMap[i][0], &status);
@ -208,7 +208,7 @@ static void TestUDataOpen(){
{
int i;
log_verbose("Testing udata_open() on %s\n", icuDataFilePath);
for(i=0; i<sizeof(memMap)/sizeof(memMap[0]); i++){
for(i=0; i<UPRV_LENGTHOF(memMap); i++){
/* lots_of_mallocs(); */
status=U_ZERO_ERROR;
result=udata_open(path, memMap[i][1], memMap[i][0], &status);
@ -259,7 +259,7 @@ static void TestUDataOpen(){
strcat(icuDataFilePath, dirSepString);
strcat(icuDataFilePath, U_ICUDATA_NAME);
log_verbose("Testing udata_open() on %s\n", icuDataFilePath);
for(i=0; i<sizeof(memMap)/sizeof(memMap[0]); i++){
for(i=0; i<UPRV_LENGTHOF(memMap); i++){
status=U_ZERO_ERROR;
result=udata_open(icuDataFilePath, memMap[i][1], memMap[i][0], &status);
if(U_FAILURE(status)) {

9
icu4c/source/test/cintltst/udatpg_test.c
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2007-2015, International Business Machines
* Copyright (C) 2007-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -30,6 +30,7 @@
#include "unicode/udatpg.h"
#include "unicode/ustring.h"
#include "cintltst.h"
#include "cmemory.h"
void addDateTimePatternGeneratorTest(TestNode** root);
@ -338,7 +339,7 @@ static void TestBuilder() {
udatpg_close(dtpg);
/* sample code in Userguide */
patternCapacity = (int32_t)(sizeof(pattern)/sizeof((pattern)[0]));
patternCapacity = UPRV_LENGTHOF(pattern);
status=U_ZERO_ERROR;
generator=udatpg_open(locale, &status);
if(U_FAILURE(status)) {
@ -357,7 +358,7 @@ static void TestBuilder() {
}
/* use it to format (or parse) */
formattedCapacity = (int32_t)(sizeof(formatted)/sizeof((formatted)[0]));
formattedCapacity = UPRV_LENGTHOF(formatted);
resultLen=udat_format(formatter, ucal_getNow(), formatted, formattedCapacity,
NULL, &status);
/* for French, the result is "13 sept." */
@ -408,7 +409,7 @@ static void TestOptions() {
{ "da", skel_hhmm, UDATPG_MATCH_HOUR_FIELD_LENGTH, patn_hhpmm_a },
};
int count = sizeof(testData) / sizeof(testData[0]);
int count = UPRV_LENGTHOF(testData);
const DTPtnGenOptionsData * testDataPtr = testData;
for (; count-- > 0; ++testDataPtr) {

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

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2002-2015, International Business Machines
* Copyright (C) 2002-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -206,7 +206,7 @@ static UEnumeration *getchArrayEnum(const char** source, int32_t size) {
static void EnumerationTest(void) {
UErrorCode status = U_ZERO_ERROR;
int32_t len = 0;
UEnumeration *en = getchArrayEnum(test1, sizeof(test1)/sizeof(test1[0]));
UEnumeration *en = getchArrayEnum(test1, UPRV_LENGTHOF(test1));
const char *string = NULL;
const UChar *uString = NULL;
while ((string = uenum_next(en, &len, &status))) {
@ -277,7 +277,7 @@ static UEnumeration *getuchArrayEnum(const UChar** source, int32_t size) {
static void DefaultNextTest(void) {
UErrorCode status = U_ZERO_ERROR;
int32_t len = 0;
UEnumeration *en = getuchArrayEnum(test2, sizeof(test2)/sizeof(test2[0]));
UEnumeration *en = getuchArrayEnum(test2, UPRV_LENGTHOF(test2));
const char *string = NULL;
const UChar *uString = NULL;
while ((uString = uenum_unext(en, &len, &status))) {

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

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2002-2014, International Business Machines
* Copyright (c) 2002-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -60,19 +60,19 @@ static void Testj2269() {
}
static const UChar PAT[] = {91,97,45,99,123,97,98,125,93,0}; /* "[a-c{ab}]" */
static const int32_t PAT_LEN = (sizeof(PAT) / sizeof(PAT[0])) - 1;
static const int32_t PAT_LEN = UPRV_LENGTHOF(PAT) - 1;
static const UChar PAT_lb[] = {0x6C, 0x62, 0}; /* "lb" */
static const int32_t PAT_lb_LEN = (sizeof(PAT_lb) / sizeof(PAT_lb[0])) - 1;
static const int32_t PAT_lb_LEN = UPRV_LENGTHOF(PAT_lb) - 1;
static const UChar VAL_SP[] = {0x53, 0x50, 0}; /* "SP" */
static const int32_t VAL_SP_LEN = (sizeof(VAL_SP) / sizeof(VAL_SP[0])) - 1;
static const int32_t VAL_SP_LEN = UPRV_LENGTHOF(VAL_SP) - 1;
static const UChar STR_bc[] = {98,99,0}; /* "bc" */
static const int32_t STR_bc_LEN = (sizeof(STR_bc) / sizeof(STR_bc[0])) - 1;
static const int32_t STR_bc_LEN = UPRV_LENGTHOF(STR_bc) - 1;
static const UChar STR_ab[] = {97,98,0}; /* "ab" */
static const int32_t STR_ab_LEN = (sizeof(STR_ab) / sizeof(STR_ab[0])) - 1;
static const int32_t STR_ab_LEN = UPRV_LENGTHOF(STR_ab) - 1;
/**
* Basic API test for uset.x

32
icu4c/source/test/cintltst/usrchtst.c
View file

@ -1,5 +1,5 @@
/********************************************************************
* Copyright (c) 2001-2011,2015 International Business Machines
* Copyright (c) 2001-2011,2015,2016 International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************
* File usrchtst.c
@ -2604,8 +2604,8 @@ static void TestStrengthIdentical(void)
UChar pattern[] = {0x05E9, 0x0591, 0x05E9};
UChar text[] = {0x05E9, 0x0592, 0x05E9};
int32_t pLen = sizeof (pattern) / sizeof(pattern[0]);
int32_t tLen = sizeof(text) / sizeof (text[0]);
int32_t pLen = UPRV_LENGTHOF(pattern);
int32_t tLen = UPRV_LENGTHOF(text);
int32_t expectedPos = 0;
int32_t expectedLen = 3;
@ -2656,8 +2656,6 @@ static void TestStrengthIdentical(void)
* TestUsingSearchCollator
*/
#define ARRAY_LENGTH(array) (sizeof(array)/sizeof(array[0]))
typedef struct {
const UChar * pattern;
const int32_t * offsets;
@ -2693,12 +2691,12 @@ static const int32_t scKoSrchOff23[] = { 5, 21, 25 };
static const int32_t scKoSrchOff45[] = { 7, 30 };
static const PatternAndOffsets scKoSrchPatternsOffsets[] = {
{ scKoPat0, scKoSrchOff01, ARRAY_LENGTH(scKoSrchOff01) },
{ scKoPat1, scKoSrchOff01, ARRAY_LENGTH(scKoSrchOff01) },
{ scKoPat2, scKoSrchOff23, ARRAY_LENGTH(scKoSrchOff23) },
{ scKoPat3, scKoSrchOff23, ARRAY_LENGTH(scKoSrchOff23) },
{ scKoPat4, scKoSrchOff45, ARRAY_LENGTH(scKoSrchOff45) },
{ scKoPat5, scKoSrchOff45, ARRAY_LENGTH(scKoSrchOff45) },
{ scKoPat0, scKoSrchOff01, UPRV_LENGTHOF(scKoSrchOff01) },
{ scKoPat1, scKoSrchOff01, UPRV_LENGTHOF(scKoSrchOff01) },
{ scKoPat2, scKoSrchOff23, UPRV_LENGTHOF(scKoSrchOff23) },
{ scKoPat3, scKoSrchOff23, UPRV_LENGTHOF(scKoSrchOff23) },
{ scKoPat4, scKoSrchOff45, UPRV_LENGTHOF(scKoSrchOff45) },
{ scKoPat5, scKoSrchOff45, UPRV_LENGTHOF(scKoSrchOff45) },
{ NULL, NULL, 0 }
};
@ -2708,12 +2706,12 @@ static const int32_t scKoStndOff3[] = { 25 };
static const int32_t scKoStndOff45[] = { 7, 30 };
static const PatternAndOffsets scKoStndPatternsOffsets[] = {
{ scKoPat0, scKoStndOff01, ARRAY_LENGTH(scKoStndOff01) },
{ scKoPat1, scKoStndOff01, ARRAY_LENGTH(scKoStndOff01) },
{ scKoPat2, scKoStndOff2, ARRAY_LENGTH(scKoStndOff2) },
{ scKoPat3, scKoStndOff3, ARRAY_LENGTH(scKoStndOff3) },
{ scKoPat4, scKoStndOff45, ARRAY_LENGTH(scKoStndOff45) },
{ scKoPat5, scKoStndOff45, ARRAY_LENGTH(scKoStndOff45) },
{ scKoPat0, scKoStndOff01, UPRV_LENGTHOF(scKoStndOff01) },
{ scKoPat1, scKoStndOff01, UPRV_LENGTHOF(scKoStndOff01) },
{ scKoPat2, scKoStndOff2, UPRV_LENGTHOF(scKoStndOff2) },
{ scKoPat3, scKoStndOff3, UPRV_LENGTHOF(scKoStndOff3) },
{ scKoPat4, scKoStndOff45, UPRV_LENGTHOF(scKoStndOff45) },
{ scKoPat5, scKoStndOff45, UPRV_LENGTHOF(scKoStndOff45) },
{ NULL, NULL, 0 }
};

24
icu4c/source/test/cintltst/utf16tst.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1998-2014, International Business Machines Corporation and
* Copyright (c) 1998-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*
@ -56,7 +56,7 @@ static void TestCodeUnitValues()
static uint16_t codeunit[]={0x0000,0xe065,0x20ac,0xd7ff,0xd800,0xd841,0xd905,0xdbff,0xdc00,0xdc02,0xddee,0xdfff,0};
int16_t i;
for(i=0; i<sizeof(codeunit)/sizeof(codeunit[0]); i++){
for(i=0; i<UPRV_LENGTHOF(codeunit); i++){
UChar c=codeunit[i];
log_verbose("Testing code unit value of %x\n", c);
if(i<4){
@ -94,7 +94,7 @@ static void TestCharLength()
int16_t i;
UBool multiple;
for(i=0; i<sizeof(codepoint)/sizeof(codepoint[0]); i=(int16_t)(i+2)){
for(i=0; i<UPRV_LENGTHOF(codepoint); i=(int16_t)(i+2)){
UChar32 c=codepoint[i+1];
if(UTF16_CHAR_LENGTH(c) != (uint16_t)codepoint[i] || U16_LENGTH(c) != (uint16_t)codepoint[i]){
log_err("The no: of code units for %lx:- Expected: %d Got: %d\n", c, codepoint[i], UTF16_CHAR_LENGTH(c));
@ -486,7 +486,7 @@ static void TestFwdBack(){
offunsafe=0;
offsafe=0;
for(i=0; i<sizeof(Nvalue)/sizeof(Nvalue[0])-2; i++){ /*didn't want it to fail(we assume 0<i<length)*/
for(i=0; i<UPRV_LENGTHOF(Nvalue)-2; i++){ /*didn't want it to fail(we assume 0<i<length)*/
UTF16_FWD_N_UNSAFE(input, offunsafe, Nvalue[i]);
if(offunsafe != fwd_N_unsafe[i]){
log_err("ERROR: Forward_N_unsafe offset expected:%d, Got:%d\n", fwd_N_unsafe[i], offunsafe);
@ -494,7 +494,7 @@ static void TestFwdBack(){
}
offunsafe=0;
for(i=0; i<sizeof(Nvalue)/sizeof(Nvalue[0])-2; i++){ /*didn't want it to fail(we assume 0<i<length)*/
for(i=0; i<UPRV_LENGTHOF(Nvalue)-2; i++){ /*didn't want it to fail(we assume 0<i<length)*/
U16_FWD_N_UNSAFE(input, offunsafe, Nvalue[i]);
if(offunsafe != fwd_N_unsafe[i]){
log_err("ERROR: U16_FWD_N_UNSAFE offset expected:%d, Got:%d\n", fwd_N_unsafe[i], offunsafe);
@ -502,7 +502,7 @@ static void TestFwdBack(){
}
offsafe=0;
for(i=0; i<sizeof(Nvalue)/sizeof(Nvalue[0]); i++){
for(i=0; i<UPRV_LENGTHOF(Nvalue); i++){
UTF16_FWD_N_SAFE(input, offsafe, sizeof(input)/U_SIZEOF_UCHAR, Nvalue[i]);
if(offsafe != fwd_N_safe[i]){
log_err("ERROR: Forward_N_safe offset expected:%d, Got:%d\n", fwd_N_safe[i], offsafe);
@ -511,7 +511,7 @@ static void TestFwdBack(){
}
offsafe=0;
for(i=0; i<sizeof(Nvalue)/sizeof(Nvalue[0]); i++){
for(i=0; i<UPRV_LENGTHOF(Nvalue); i++){
U16_FWD_N(input, offsafe, sizeof(input)/U_SIZEOF_UCHAR, Nvalue[i]);
if(offsafe != fwd_N_safe[i]){
log_err("ERROR: U16_FWD_N offset expected:%d, Got:%d\n", fwd_N_safe[i], offsafe);
@ -520,7 +520,7 @@ static void TestFwdBack(){
}
offunsafe=sizeof(input)/U_SIZEOF_UCHAR;
for(i=0; i<sizeof(Nvalue)/sizeof(Nvalue[0])-2; i++){
for(i=0; i<UPRV_LENGTHOF(Nvalue)-2; i++){
UTF16_BACK_N_UNSAFE(input, offunsafe, Nvalue[i]);
if(offunsafe != back_N_unsafe[i]){
log_err("ERROR: backward_N_unsafe offset expected:%d, Got:%d\n", back_N_unsafe[i], offunsafe);
@ -528,7 +528,7 @@ static void TestFwdBack(){
}
offunsafe=sizeof(input)/U_SIZEOF_UCHAR;
for(i=0; i<sizeof(Nvalue)/sizeof(Nvalue[0])-2; i++){
for(i=0; i<UPRV_LENGTHOF(Nvalue)-2; i++){
U16_BACK_N_UNSAFE(input, offunsafe, Nvalue[i]);
if(offunsafe != back_N_unsafe[i]){
log_err("ERROR: U16_BACK_N_UNSAFE offset expected:%d, Got:%d\n", back_N_unsafe[i], offunsafe);
@ -536,7 +536,7 @@ static void TestFwdBack(){
}
offsafe=sizeof(input)/U_SIZEOF_UCHAR;
for(i=0; i<sizeof(Nvalue)/sizeof(Nvalue[0]); i++){
for(i=0; i<UPRV_LENGTHOF(Nvalue); i++){
UTF16_BACK_N_SAFE(input, 0, offsafe, Nvalue[i]);
if(offsafe != back_N_safe[i]){
log_err("ERROR: backward_N_safe offset expected:%d, Got:%d\n", back_N_safe[i], offsafe);
@ -544,7 +544,7 @@ static void TestFwdBack(){
}
offsafe=sizeof(input)/U_SIZEOF_UCHAR;
for(i=0; i<sizeof(Nvalue)/sizeof(Nvalue[0]); i++){
for(i=0; i<UPRV_LENGTHOF(Nvalue); i++){
U16_BACK_N(input, 0, offsafe, Nvalue[i]);
if(offsafe != back_N_safe[i]){
log_err("ERROR: U16_BACK_N offset expected:%d, Got:%d\n", back_N_safe[i], offsafe);
@ -669,7 +669,7 @@ static void TestAppendChar(){
uint16_t i, count=0;
UChar *str=(UChar*)malloc(sizeof(UChar) * (u_strlen(s)+1));
uint16_t offset;
for(i=0; i<sizeof(test)/sizeof(test[0]); i=(uint16_t)(i+2)){
for(i=0; i<UPRV_LENGTHOF(test); i=(uint16_t)(i+2)){
if(count<5){
u_strcpy(str, s);
offset=(uint16_t)test[i];

7
icu4c/source/test/cintltst/utransts.c
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1997-2009,2014 International Business Machines
* Copyright (C) 1997-2016 International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* Date Name Description
@ -18,6 +18,7 @@
#include "unicode/ustring.h"
#include "unicode/uset.h"
#include "cintltst.h"
#include "cmemory.h"
#define TEST(x) addTest(root, &x, "utrans/" # x)
@ -270,7 +271,7 @@ static void TestOpenInverse(){
"Hex-Any"
};
for(i=0; i<sizeof(TransID)/sizeof(TransID[0]); i=i+2){
for(i=0; i<UPRV_LENGTHOF(TransID); i=i+2){
status = U_ZERO_ERROR;
t1=utrans_open(TransID[i], UTRANS_FORWARD,NULL,0,NULL, &status);
if(t1 == NULL || U_FAILURE(status)){
@ -502,7 +503,7 @@ static void TestFilter() {
"abcde",
"\\u0061\\u0062\\u0063\\u0064\\u0065"
};
int32_t DATA_length = sizeof(DATA) / sizeof(DATA[0]);
int32_t DATA_length = UPRV_LENGTHOF(DATA);
int32_t i;
UTransliterator* hex = utrans_open("Any-Hex", UTRANS_FORWARD, NULL,0,NULL,&status);

5
icu4c/source/test/intltest/allcoll.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2009, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -13,6 +13,7 @@
#include "unicode/unistr.h"
#include "unicode/sortkey.h"
#include "allcoll.h"
#include "cmemory.h"
#include "sfwdchit.h"
#include "../cintltst/calldata.h"
@ -21,7 +22,7 @@ CollationDummyTest::CollationDummyTest()
: myCollation(0)
{
/*UErrorCode status = U_ZERO_ERROR;
UnicodeString rules(TRUE, DEFAULTRULEARRAY, sizeof(DEFAULTRULEARRAY)/sizeof(DEFAULTRULEARRAY[0]));
UnicodeString rules(TRUE, DEFAULTRULEARRAY, UPRV_LENGTHOF(DEFAULTRULEARRAY));
UnicodeString newRules("& C < ch, cH, Ch, CH & Five, 5 & Four, 4 & one, 1 & Ampersand; '&' & Two, 2 ");
rules += newRules;
myCollation = new RuleBasedCollator(rules, status);

4
icu4c/source/test/intltest/alphaindextst.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2012-2015, International Business Machines Corporation
* Copyright (c) 2012-2016, International Business Machines Corporation
* and others. All Rights Reserved.
********************************************************************/
//
@ -429,7 +429,7 @@ void AlphabeticIndexTest::HackPinyinTest() {
AlphabeticIndex aindex(Locale::createFromName("zh"), status);
TEST_CHECK_STATUS;
UnicodeString names[sizeof(pinyinTestData) / sizeof(pinyinTestData[0])];
UnicodeString names[UPRV_LENGTHOF(pinyinTestData)];
int32_t nameCount;
for (nameCount=0; pinyinTestData[nameCount] != NULL; nameCount++) {
names[nameCount] = UnicodeString(pinyinTestData[nameCount], -1, UnicodeString::kInvariant).unescape();

10
icu4c/source/test/intltest/apicoll.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
//===============================================================================
@ -1650,7 +1650,7 @@ void CollationAPITest::TestGetLocale() {
u_unescape(rules, rlz, 256);
/* test opening collators for different locales */
for(i = 0; i<(int32_t)UPRV_LENGTHOF(testStruct); i++) {
for(i = 0; i<UPRV_LENGTHOF(testStruct); i++) {
status = U_ZERO_ERROR;
coll = Collator::createInstance(testStruct[i].requestedLocale, status);
if(U_FAILURE(status)) {
@ -1838,7 +1838,7 @@ void CollationAPITest::TestBounds(void) {
int32_t i = 0, j = 0, k = 0, buffSize = 0, skSize = 0, lowerSize = 0, upperSize = 0;
int32_t arraySize = sizeof(tests)/sizeof(tests[0]);
int32_t arraySize = UPRV_LENGTHOF(tests);
(void)lowerSize; // Suppress unused variable warnings.
(void)upperSize;
@ -1866,12 +1866,12 @@ void CollationAPITest::TestBounds(void) {
}
for(i = 0; i<(int32_t)(sizeof(test)/sizeof(test[0])); i++) {
for(i = 0; i<UPRV_LENGTHOF(test); i++) {
buffSize = u_unescape(test[i], buffer, 512);
skSize = coll->getSortKey(buffer, buffSize, sortkey, 512);
lowerSize = ucol_getBound(sortkey, skSize, UCOL_BOUND_LOWER, 1, lower, 512, &status);
upperSize = ucol_getBound(sortkey, skSize, UCOL_BOUND_UPPER_LONG, 1, upper, 512, &status);
for(j = i+1; j<(int32_t)(sizeof(test)/sizeof(test[0])); j++) {
for(j = i+1; j<UPRV_LENGTHOF(test); j++) {
buffSize = u_unescape(test[j], buffer, 512);
skSize = coll->getSortKey(buffer, buffSize, sortkey, 512);
if(strcmp((const char *)lower, (const char *)sortkey) > 0) {

11
icu4c/source/test/intltest/astrotst.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1996-2014, International Business Machines Corporation and
* Copyright (c) 1996-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -14,6 +14,7 @@
#include "astro.h"
#include "astrotst.h"
#include "cmemory.h"
#include "gregoimp.h" // for Math
#include "unicode/simpletz.h"
@ -85,7 +86,7 @@ void AstroTest::TestSolarLongitude(void) {
};
logln("");
for (uint32_t i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
for (uint32_t i = 0; i < UPRV_LENGTHOF(tests); i++) {
gc->clear();
gc->set(tests[i].d[0], tests[i].d[1]-1, tests[i].d[2], tests[i].d[3], tests[i].d[4]);
@ -113,7 +114,7 @@ void AstroTest::TestLunarPosition(void) {
};
logln("");
for (int32_t i = 0; i < (int32_t)(sizeof(tests)/sizeof(tests[0])); i++) {
for (int32_t i = 0; i < UPRV_LENGTHOF(tests); i++) {
gc->clear();
gc->set((int32_t)tests[i][0], (int32_t)tests[i][1]-1, (int32_t)tests[i][2], (int32_t)tests[i][3], (int32_t)tests[i][4]);
astro->setDate(gc->getTime(status));
@ -171,7 +172,7 @@ void AstroTest::TestCoverage(void) {
myastro, myastro2, myastro3, myastro2 // check cache
};
for (uint32_t i = 0; i < sizeof(astronomers)/sizeof(astronomers[0]); ++i) {
for (uint32_t i = 0; i < UPRV_LENGTHOF(astronomers); ++i) {
CalendarAstronomer *anAstro = astronomers[i];
//logln("astro: " + astro);
@ -450,7 +451,7 @@ void AstroTest::TestMoonAge(void){
static const double angle[] = {356.8493418421329, 356.8386760059673, 0.09625415252237701, 355.9986960782416, 3.5714026601303317, 124.26906744384183, 59.80247650195558,
357.54163205513123, 268.41779281511094, 4.82340276581624};
static const double precision = CalendarAstronomer::PI/32;
for (int32_t i = 0; i < (int32_t)(sizeof(testcase)/sizeof(testcase[0])); i++) {
for (int32_t i = 0; i < UPRV_LENGTHOF(testcase); i++) {
gc->clear();
logln((UnicodeString)"CASE["+i+"]: Year "+(int32_t)testcase[i][0]+" Month "+(int32_t)testcase[i][1]+" Day "+
(int32_t)testcase[i][2]+" Hour "+(int32_t)testcase[i][3]+" Minutes "+(int32_t)testcase[i][4]+

10
icu4c/source/test/intltest/calregts.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2014, International Business Machines Corporation
* Copyright (c) 1997-2016, International Business Machines Corporation
* and others. All Rights Reserved.
********************************************************************/
@ -1997,7 +1997,7 @@ void CalendarRegressionTest::Test4197699() {
2000, UCAL_JANUARY, 1, 52,
2001, UCAL_DECEMBER, 31, 1,
};
int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
int32_t DATA_length = UPRV_LENGTHOF(DATA);
UnicodeString str;
DateFormat& dfmt = *(DateFormat*)&fmt;
@ -2100,7 +2100,7 @@ void CalendarRegressionTest::TestJ81() {
30, 42, 293, UCAL_SATURDAY,
31, 43, 294, UCAL_SUNDAY
};
int32_t DOY_DATA_length = (int32_t)(sizeof(DOY_DATA) / sizeof(DOY_DATA[0]));
int32_t DOY_DATA_length = UPRV_LENGTHOF(DOY_DATA);
for (i=0; i<DOY_DATA_length; i+=4) {
// Test time->fields
@ -2190,7 +2190,7 @@ void CalendarRegressionTest::TestJ81() {
// { Calendar::YEAR_WOY, ADD|ROLL, 1, -ONE_DAY, +6*ONE_DAY },
// { Calendar::DOW_LOCAL, ADD|ROLL, 2, -ONE_DAY, +1*ONE_DAY }
};
int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
int32_t DATA_length = UPRV_LENGTHOF(DATA);
// Now run the tests
for (i=0; i<DATA_length; ++i) {
@ -2264,7 +2264,7 @@ void CalendarRegressionTest::TestJ438(void) {
1964, UCAL_SEPTEMBER, 7, 1999, UCAL_JUNE, 4,
1999, UCAL_JUNE, 4, 1964, UCAL_SEPTEMBER, 7,
};
int32_t DATA_length = (int32_t)(sizeof(DATA)/sizeof(DATA[0]));
int32_t DATA_length = UPRV_LENGTHOF(DATA);
Calendar* pcal = Calendar::createInstance(Locale::getUS(), ec);
if(U_FAILURE(ec)) {
dataerrln("Error creating calendar %s", u_errorName(ec));

7
icu4c/source/test/intltest/canittst.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2002-2014, International Business Machines Corporation and
* Copyright (c) 2002-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************
*
@ -13,6 +13,7 @@
#if !UCONFIG_NO_NORMALIZATION
#include "intltest.h"
#include "cmemory.h"
#include "cstring.h"
#include "canittst.h"
#include "unicode/caniter.h"
@ -20,8 +21,6 @@
#include "unicode/uchar.h"
#include "hash.h"
#define ARRAY_LENGTH(array) ((int32_t)(sizeof (array) / sizeof (*array)))
#define CASE(id,test) case id: \
name = #test; \
if (exec) { \
@ -148,7 +147,7 @@ void CanonicalIteratorTest::TestBasic() {
int32_t i = 0;
CanonicalIterator it("", status);
if(U_SUCCESS(status)) {
for (i = 0; i < ARRAY_LENGTH(testArray); ++i) {
for (i = 0; i < UPRV_LENGTHOF(testArray); ++i) {
//logln("Results for: " + name.transliterate(testArray[i]));
UnicodeString testStr = CharsToUnicodeString(testArray[i][0]);
it.setSource(testStr, status);

5
icu4c/source/test/intltest/colldata.cpp
View file

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1996-2014, International Business Machines
* Copyright (C) 1996-2016, International Business Machines
* Corporation and others. All Rights Reserved.
******************************************************************************
*/
@ -32,7 +32,6 @@
#include "colldata.h"
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
#define NEW_ARRAY(type, count) (type *) uprv_malloc((count) * sizeof(type))
#define DELETE_ARRAY(array) uprv_free((void *) (array))
#define ARRAY_COPY(dst, src, count) uprv_memcpy((void *) (dst), (void *) (src), (count) * sizeof (src)[0])
@ -428,7 +427,7 @@ bail:
// Maybe use [:HST=T:] and look for the end of the last range?
// Maybe use script boundary mappings instead of this code??
UChar jamoRanges[] = {Hangul::JAMO_L_BASE, Hangul::JAMO_V_BASE, Hangul::JAMO_T_BASE + 1, 0x11FF};
UnicodeString jamoString(FALSE, jamoRanges, ARRAY_SIZE(jamoRanges));
UnicodeString jamoString(FALSE, jamoRanges, UPRV_LENGTHOF(jamoRanges));
CEList hanList(coll, hanString, status);
CEList jamoList(coll, jamoString, status);
int32_t j = 0;

4
icu4c/source/test/intltest/cpdtrtst.cpp
View file

@ -1,6 +1,6 @@
/***************************************************************************
*
* Copyright (C) 2000-2009, International Business Machines
* Copyright (C) 2000-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
************************************************************************
@ -385,7 +385,7 @@ void CompoundTransliteratorTest::TestTransliterate(){
CharsToUnicodeString("vavivuvevohuzizuzonyinyunyasesuzezu"),
};
uint32_t i;
for(i=0; i<sizeof(Data)/sizeof(Data[0]); i=i+3){
for(i=0; i<UPRV_LENGTHOF(Data); i=i+3){
UErrorCode status = U_ZERO_ERROR;
CompoundTransliterator *ct2=new CompoundTransliterator(Data[i+0], parseError, status);

4
icu4c/source/test/intltest/csdetest.cpp
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2015, International Business Machines
* Copyright (C) 2005-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -25,8 +25,6 @@
#include <stdio.h>
#endif
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#define NEW_ARRAY(type,count) (type *) /*uprv_*/malloc((count) * sizeof(type))
#define DELETE_ARRAY(array) /*uprv_*/free((void *) (array))

9
icu4c/source/test/intltest/currcoll.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2009, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -28,10 +28,9 @@
#include "currcoll.h"
#endif
#include "cmemory.h"
#include "sfwdchit.h"
#define ARRAY_LENGTH(array) (sizeof array / sizeof array[0])
CollationCurrencyTest::CollationCurrencyTest()
{
}
@ -91,9 +90,9 @@ void CollationCurrencyTest::currencyTest(/*char *par*/)
// Compare each currency symbol against all the
// currency symbols, including itself
for (i = 0; i < ARRAY_LENGTH(currency); i += 1)
for (i = 0; i < UPRV_LENGTHOF(currency); i += 1)
{
for (j = 0; j < ARRAY_LENGTH(currency); j += 1)
for (j = 0; j < UPRV_LENGTHOF(currency); j += 1)
{
UnicodeString source(currency[i], 1);
UnicodeString target(currency[j], 1);

7
icu4c/source/test/intltest/dtfmrgts.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2015, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -15,6 +15,7 @@
#include "unicode/datefmt.h"
#include "unicode/simpletz.h"
#include "unicode/resbund.h"
#include "cmemory.h"
// *****************************************************************************
// class DateFormatRegressionTest
@ -1133,7 +1134,7 @@ void DateFormatRegressionTest::Test4182066(void) {
"09/12/+1",
"09/12/001",
};
int32_t STRINGS_COUNT = (int32_t)(sizeof(STRINGS) / sizeof(STRINGS[0]));
int32_t STRINGS_COUNT = UPRV_LENGTHOF(STRINGS);
UDate FAIL_DATE = (UDate) 0;
UDate DATES[] = {
date(2000-1900, UCAL_FEBRUARY, 29),
@ -1327,7 +1328,7 @@ void DateFormatRegressionTest::Test1684(void)
new Test1684Data(2001,12,30, /*2002, 1, 6,*/ 2002,1,1,UCAL_SUNDAY, "2002 01 01 Sun", "2001 12 06 Sun")
};
#define kTest1684Count ((int32_t)(sizeof(tests)/sizeof(tests[0])))
#define kTest1684Count UPRV_LENGTHOF(tests)
int32_t pass = 0, error = 0, warning = 0;
int32_t i;

62
icu4c/source/test/intltest/dtfmttst.cpp
View file

@ -27,8 +27,6 @@
#include "windttst.h"
#endif
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#define ASSERT_OK(status) if(U_FAILURE(status)) {errcheckln(status, #status " = %s @ %s:%d", u_errorName(status), __FILE__, __LINE__); return; }
// *****************************************************************************
@ -485,7 +483,7 @@ static const char* DATEFORMAT_FIELD_NAMES[] = {
};
static const int32_t DATEFORMAT_FIELD_NAMES_LENGTH =
sizeof(DATEFORMAT_FIELD_NAMES) / sizeof(DATEFORMAT_FIELD_NAMES[0]);
UPRV_LENGTHOF(DATEFORMAT_FIELD_NAMES);
/**
* Verify that returned field position indices are correct.
@ -575,7 +573,7 @@ void DateFormatTest::TestFieldPosition() {
#endif
};
const int32_t EXPECTED_LENGTH = sizeof(EXPECTED)/sizeof(EXPECTED[0]);
const int32_t EXPECTED_LENGTH = UPRV_LENGTHOF(EXPECTED);
assertTrue("data size", EXPECTED_LENGTH == COUNT * UDAT_FIELD_COUNT);
@ -651,7 +649,7 @@ void DateFormatTest::TestGeneral() {
"y/M/d H:mm:ss.SSS", "F", "2004 03 10 16:36:31.567", "2004/3/10 16:36:31.567",
"y/M/d H:mm:ss.SSSS", "pf", "2004/3/10 16:36:31.5679", "2004 03 10 16:36:31.567", "2004/3/10 16:36:31.5670",
};
expect(DATA, ARRAY_SIZE(DATA), Locale("en", "", ""));
expect(DATA, UPRV_LENGTHOF(DATA), Locale("en", "", ""));
}
// -------------------------------------
@ -968,11 +966,11 @@ DateFormatTest::TestBadInput135()
DateFormat::EStyle looks[] = {
DateFormat::SHORT, DateFormat::MEDIUM, DateFormat::LONG, DateFormat::FULL
};
int32_t looks_length = (int32_t)(sizeof(looks) / sizeof(looks[0]));
int32_t looks_length = UPRV_LENGTHOF(looks);
const char* strings[] = {
"Mar 15", "Mar 15 1997", "asdf", "3/1/97 1:23:", "3/1/00 1:23:45 AM"
};
int32_t strings_length = (int32_t)(sizeof(strings) / sizeof(strings[0]));
int32_t strings_length = UPRV_LENGTHOF(strings);
DateFormat *full = DateFormat::createDateTimeInstance(DateFormat::LONG, DateFormat::LONG);
if(full==NULL) {
dataerrln("could not create date time instance");
@ -1090,8 +1088,8 @@ DateFormatTest::TestBadInput135a()
}
const char* s;
UDate date;
const uint32_t PF_LENGTH = (int32_t)(sizeof(parseFormats)/sizeof(parseFormats[0]));
const uint32_t INPUT_LENGTH = (int32_t)(sizeof(inputStrings)/sizeof(inputStrings[0]));
const uint32_t PF_LENGTH = UPRV_LENGTHOF(parseFormats);
const uint32_t INPUT_LENGTH = UPRV_LENGTHOF(inputStrings);
dateParse->applyPattern("d MMMM, yyyy");
dateParse->adoptTimeZone(TimeZone::createDefault());
@ -1275,7 +1273,7 @@ DateFormatTest::TestDateFormatZone146()
UnicodeString("short format: "), UnicodeString("4/4/97 11:00 PM"),
UnicodeString("M/d/yy h:mm a")
};
int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
int32_t DATA_length = UPRV_LENGTHOF(DATA);
for (int32_t i=0; i<DATA_length; i+=3) {
DateFormat *fmt = new SimpleDateFormat(DATA[i+2], Locale::getEnglish(), status);
@ -1505,7 +1503,7 @@ void DateFormatTest::TestSpaceParsing() {
NULL, "12h34m56s", "1970 01 01 12:34:56",
NULL, "12:34:56", "1970 01 01 12:34:56"
};
const int32_t DATA_len = sizeof(DATA)/sizeof(DATA[0]);
const int32_t DATA_len = UPRV_LENGTHOF(DATA);
expectParse(DATA, DATA_len, Locale("en"));
}
@ -1526,7 +1524,7 @@ void DateFormatTest::TestExactCountFormat() {
NULL, "00+05", NULL,
"ahhmm", "PM730", "1970 01 01 19:30:00",
};
const int32_t DATA_len = sizeof(DATA)/sizeof(DATA[0]);
const int32_t DATA_len = UPRV_LENGTHOF(DATA);
expectParse(DATA, DATA_len, Locale("en"));
}
@ -1544,7 +1542,7 @@ void DateFormatTest::TestWhiteSpaceParsing() {
"MM d yy", " 04 01 03", "2003 04 01",
NULL, " 04 01 03 ", "2003 04 01",
};
const int32_t DATA_len = sizeof(DATA)/sizeof(DATA[0]);
const int32_t DATA_len = UPRV_LENGTHOF(DATA);
expectParse(DATA, DATA_len, Locale("en"));
}
@ -1657,8 +1655,8 @@ void DateFormatTest::TestStandAloneMonths()
"LLL", "fp", "1970 12 01 0:00:00", "pro", "1970 12 01 0:00:00",
};
expect(EN_DATA, ARRAY_SIZE(EN_DATA), Locale("en", "", ""));
expect(CS_DATA, ARRAY_SIZE(CS_DATA), Locale("cs", "", ""));
expect(EN_DATA, UPRV_LENGTHOF(EN_DATA), Locale("en", "", ""));
expect(CS_DATA, UPRV_LENGTHOF(CS_DATA), Locale("cs", "", ""));
}
void DateFormatTest::TestStandAloneDays()
@ -1703,8 +1701,8 @@ void DateFormatTest::TestStandAloneDays()
"ccc", "fp", "1970 01 03 0:00:00", "so", "1970 01 03 0:00:00",
};
expect(EN_DATA, ARRAY_SIZE(EN_DATA), Locale("en", "", ""));
expect(CS_DATA, ARRAY_SIZE(CS_DATA), Locale("cs", "", ""));
expect(EN_DATA, UPRV_LENGTHOF(EN_DATA), Locale("en", "", ""));
expect(CS_DATA, UPRV_LENGTHOF(CS_DATA), Locale("cs", "", ""));
}
void DateFormatTest::TestShortDays()
@ -1727,8 +1725,8 @@ void DateFormatTest::TestShortDays()
"cccccc d", "fp", "1970 01 17 0:00:00", "l\\u00F6 17", "1970 01 17 0:00:00",
"cccccc", "fp", "1970 01 03 0:00:00", "l\\u00F6", "1970 01 03 0:00:00",
};
expect(EN_DATA, ARRAY_SIZE(EN_DATA), Locale("en", "", ""));
expect(SV_DATA, ARRAY_SIZE(SV_DATA), Locale("sv", "", ""));
expect(EN_DATA, UPRV_LENGTHOF(EN_DATA), Locale("en", "", ""));
expect(SV_DATA, UPRV_LENGTHOF(SV_DATA), Locale("sv", "", ""));
}
void DateFormatTest::TestNarrowNames()
@ -1850,9 +1848,9 @@ void DateFormatTest::TestNarrowNames()
"h:mm aaaaa", "2015 01 01 22:00:00", "10:00 p. m.",
};
expectFormat(EN_DATA, ARRAY_SIZE(EN_DATA), Locale("en", "", ""));
expectFormat(CS_DATA, ARRAY_SIZE(CS_DATA), Locale("cs", "", ""));
expectFormat(CA_DATA, ARRAY_SIZE(CA_DATA), Locale("ca", "", ""));
expectFormat(EN_DATA, UPRV_LENGTHOF(EN_DATA), Locale("en", "", ""));
expectFormat(CS_DATA, UPRV_LENGTHOF(CS_DATA), Locale("cs", "", ""));
expectFormat(CA_DATA, UPRV_LENGTHOF(CA_DATA), Locale("ca", "", ""));
}
void DateFormatTest::TestEras()
@ -1871,7 +1869,7 @@ void DateFormatTest::TestEras()
"MMMM dd yyyy GGGG", "fp", "-438 07 17", "July 17 0439 Before Christ", "-438 07 17",
};
expect(EN_DATA, ARRAY_SIZE(EN_DATA), Locale("en", "", ""));
expect(EN_DATA, UPRV_LENGTHOF(EN_DATA), Locale("en", "", ""));
}
void DateFormatTest::TestQuarters()
@ -1893,7 +1891,7 @@ void DateFormatTest::TestQuarters()
"QQyy", "fp", "2015 07 01", "0315", "2015 07 01",
};
expect(EN_DATA, ARRAY_SIZE(EN_DATA), Locale("en", "", ""));
expect(EN_DATA, UPRV_LENGTHOF(EN_DATA), Locale("en", "", ""));
}
/**
@ -2207,7 +2205,7 @@ void DateFormatTest::TestGenericTime() {
"y/M/d H:mm", "pf", "2004/10/31 1:30", "2004 10 31 01:30 PST", "2004/10/31 1:30",
};
const int32_t ZDATA_length = sizeof(ZDATA)/ sizeof(ZDATA[0]);
const int32_t ZDATA_length = UPRV_LENGTHOF(ZDATA);
expect(ZDATA, ZDATA_length, en);
UErrorCode status = U_ZERO_ERROR;
@ -2224,7 +2222,7 @@ void DateFormatTest::TestGenericTime() {
dataerrln("Fail construct SimpleDateFormat: %s", u_errorName(status));
return;
}
const int32_t formats_length = sizeof(formats)/sizeof(formats[0]);
const int32_t formats_length = UPRV_LENGTHOF(formats);
UnicodeString test;
SimpleDateFormat univ("yyyy MM dd HH:mm zzz", en, status);
@ -2233,7 +2231,7 @@ void DateFormatTest::TestGenericTime() {
"2004 01 02 03:04 PST",
"2004 07 08 09:10 PDT"
};
int32_t times_length = sizeof(times)/sizeof(times[0]);
int32_t times_length = UPRV_LENGTHOF(times);
for (int i = 0; i < times_length; ++i) {
UDate d = univ.parse(times[i], status);
logln(UnicodeString("\ntime: ") + d);
@ -2311,7 +2309,7 @@ void DateFormatTest::TestGenericTimeZoneOrder() {
"y/M/d v H:mm", "pf", "2004/7/1 PT 1:00", "2004 07 01 01:00 PDT", "2004/7/1 PT 1:00",
"v y/M/d H:mm", "pf", "PT 2004/7/1 1:00", "2004 07 01 01:00 PDT", "PT 2004/7/1 1:00",
};
const int32_t XDATA_length = sizeof(XDATA)/sizeof(XDATA[0]);
const int32_t XDATA_length = UPRV_LENGTHOF(XDATA);
Locale en("en");
expect(XDATA, XDATA_length, en);
}
@ -2339,7 +2337,7 @@ void DateFormatTest::TestZTimeZoneParsing(void) {
};
UnicodeString result;
int32_t tests_length = sizeof(tests)/sizeof(tests[0]);
int32_t tests_length = UPRV_LENGTHOF(tests);
for (int i = 0; i < tests_length; ++i) {
pp.setIndex(0);
UDate d = univ.parse(tests[i].input, pp);
@ -3742,7 +3740,7 @@ void DateFormatTest::TestGMTParsing() {
"HH:mm:ssZZZZZ", "14:25:45Z", "14:25:45 +0000",
"HH:mm:ssZZZZZ", "15:00:00-08:00", "15:00:00 -0800",
};
const int32_t DATA_len = sizeof(DATA)/sizeof(DATA[0]);
const int32_t DATA_len = UPRV_LENGTHOF(DATA);
expectParse(DATA, DATA_len, Locale("en"));
}
@ -4673,7 +4671,7 @@ void DateFormatTest::TestNumberFormatOverride() {
UDate test_date = date(97, 6 - 1, 15);
for(int i=0; i < (int)(sizeof(DATA)/sizeof(DATA[0])); i++){
for(int i=0; i < UPRV_LENGTHOF(DATA); i++){
fields = DATA[i][0];
LocalPointer<SimpleDateFormat> fmt;
@ -4850,7 +4848,7 @@ void DateFormatTest::TestPatternFromSkeleton() {
{Locale::getGerman(), "JJmm", "HH:mm"}
};
for (size_t i = 0; i < sizeof TESTDATA / sizeof *TESTDATA; i++) {
for (size_t i = 0; i < UPRV_LENGTHOF(TESTDATA); i++) {
UErrorCode status = U_ZERO_ERROR;
LocalPointer<DateFormat> fmt(
DateFormat::createInstanceForSkeleton(

14
icu4c/source/test/intltest/dtifmtts.cpp
View file

@ -1,4 +1,3 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2016, International Business Machines Corporation and
@ -20,6 +19,7 @@
#include "dtifmtts.h"
#include "cmemory.h"
#include "cstr.h"
#include "cstring.h"
#include "simplethread.h"
@ -37,8 +37,6 @@
#define PRINTMESG(msg) { std::cout << msg; }
#endif
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
#include <stdio.h>
@ -1039,7 +1037,7 @@ void DateIntervalFormatTest::testFormat() {
"th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMM", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22.",
};
expect(DATA, ARRAY_SIZE(DATA));
expect(DATA, UPRV_LENGTHOF(DATA));
}
@ -1159,7 +1157,7 @@ void DateIntervalFormatTest::testFormatUserDII() {
"es", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "10 ene. 2007",
};
expectUserDII(DATA, ARRAY_SIZE(DATA));
expectUserDII(DATA, UPRV_LENGTHOF(DATA));
}
@ -1373,11 +1371,11 @@ void DateIntervalFormatTest::testStress() {
};
uint32_t localeIndex;
for ( localeIndex = 0; localeIndex < ARRAY_SIZE(testLocale); ++localeIndex ) {
for ( localeIndex = 0; localeIndex < UPRV_LENGTHOF(testLocale); ++localeIndex ) {
char locName[32];
uprv_strcpy(locName, testLocale[localeIndex][0]);
uprv_strcat(locName, testLocale[localeIndex][1]);
stress(DATA, ARRAY_SIZE(DATA), Locale(testLocale[localeIndex][0], testLocale[localeIndex][1], testLocale[localeIndex][2]), locName);
stress(DATA, UPRV_LENGTHOF(DATA), Locale(testLocale[localeIndex][0], testLocale[localeIndex][1], testLocale[localeIndex][2]), locName);
}
}
@ -1450,7 +1448,7 @@ void DateIntervalFormatTest::stress(const char** data, int32_t data_length,
DateInterval dtitv(date, date_2);
for ( uint32_t skeletonIndex = 0;
skeletonIndex < ARRAY_SIZE(skeleton);
skeletonIndex < UPRV_LENGTHOF(skeleton);
++skeletonIndex ) {
const UnicodeString& oneSkeleton = skeleton[skeletonIndex];
DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(oneSkeleton, loc, ec);

9
icu4c/source/test/intltest/dtptngts.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2008-2015, International Business Machines Corporation and
* Copyright (c) 2008-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -16,6 +16,7 @@
#include "unicode/smpdtfmt.h"
#include "unicode/dtfmtsym.h"
#include "unicode/dtptngen.h"
#include "cmemory.h"
#include "loctest.h"
@ -888,7 +889,7 @@ void IntlTestDateTimePatternGeneratorAPI::testOptions(/*char *par*/)
{ "zh@calendar=chinese", "GUMMM", "rU\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS },
};
int count = sizeof(testData) / sizeof(testData[0]);
int count = UPRV_LENGTHOF(testData);
const DTPtnGenOptionsData * testDataPtr = testData;
for (; count-- > 0; ++testDataPtr) {
@ -1003,7 +1004,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAllFieldPatterns(/*char *par*/)
DateTimePatternGenerator * dtpg = DateTimePatternGenerator::createInstance(locale, status);
if (U_SUCCESS(status)) {
const AllFieldsTestItem * testDataPtr = testData;
int itemCount = sizeof(testData) / sizeof(testData[0]);
int itemCount = UPRV_LENGTHOF(testData);
for (; itemCount-- > 0; ++testDataPtr) {
char skelBuf[FIELD_LENGTH_MAX];
int32_t chrIndx, lenIndx;
@ -1069,7 +1070,7 @@ void IntlTestDateTimePatternGeneratorAPI::testStaticGetSkeleton(/*char *par*/)
"JJmm"
};
for (size_t i = 0; i < sizeof testData / sizeof *testData; i++) {
for (size_t i = 0; i < UPRV_LENGTHOF(testData); i++) {
UErrorCode status = U_ZERO_ERROR;
UnicodeString skeleton = DateTimePatternGenerator::staticGetSkeleton(testData[i], status);
if (!assertSuccess("staticGetSkeleton", status)) {

7
icu4c/source/test/intltest/encoll.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2009, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -13,6 +13,7 @@
#include "unicode/unistr.h"
#include "unicode/sortkey.h"
#include "encoll.h"
#include "cmemory.h"
CollationEnglishTest::CollationEnglishTest()
: myCollation(0)
@ -260,7 +261,7 @@ void CollationEnglishTest::TestTertiary(/* char* par */)
//test more interesting cases
Collator::EComparisonResult expected;
const int32_t testMoreSize = (int32_t)(sizeof(testMore) / sizeof(testMore[0]));
const int32_t testMoreSize = UPRV_LENGTHOF(testMore);
for (i = 0; i < testMoreSize; i++)
{
for (j = 0; j < testMoreSize; j++)
@ -299,7 +300,7 @@ void CollationEnglishTest::TestSecondary(/* char* par */)
//test acute and grave ordering (compare to french collation)
int32_t j;
Collator::EComparisonResult expected;
const int32_t testAcuteSize = (int32_t)(sizeof(testAcute) / sizeof(testAcute[0]));
const int32_t testAcuteSize = UPRV_LENGTHOF(testAcute);
for (i = 0; i < testAcuteSize; i++)
{
for (j = 0; j < testAcuteSize; j++)

5
icu4c/source/test/intltest/frcoll.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2010, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -19,6 +19,7 @@
#include "unicode/tblcoll.h"
#include "unicode/unistr.h"
#include "unicode/sortkey.h"
#include "cmemory.h"
#include "frcoll.h"
#include "sfwdchit.h"
@ -166,7 +167,7 @@ void CollationFrenchTest::TestSecondary(/* char* par */)
errln("Error setting attribute in French collator");
else
{
const int32_t testAcuteSize = (int32_t)(sizeof(testAcute) / sizeof(testAcute[0]));
const int32_t testAcuteSize = UPRV_LENGTHOF(testAcute);
for (i = 0; i < testAcuteSize; i++)
{
for (j = 0; j < testAcuteSize; j++)

5
icu4c/source/test/intltest/icusvtst.cpp
View file

@ -1,6 +1,6 @@
/**
*******************************************************************************
* Copyright (C) 2001-2013, International Business Machines Corporation and
* Copyright (C) 2001-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@ -11,6 +11,7 @@
#if !UCONFIG_NO_SERVICE
#include "cmemory.h"
#include "icusvtst.h"
#include "servloc.h"
#include <stdio.h>
@ -930,7 +931,7 @@ ICUServiceTest::testRBF()
CalifornioLanguageFactory::surfer,
CalifornioLanguageFactory::geek,
};
int32_t count = sizeof(idNames)/sizeof(idNames[0]);
int32_t count = UPRV_LENGTHOF(idNames);
for (int i = 0; i < count; ++i) {
logln(UnicodeString("\n --- ") + idNames[i] + " ---");

4
icu4c/source/test/intltest/itercoll.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2014, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -18,8 +18,6 @@
#include "unicode/uchar.h"
#include "cmemory.h"
#define ARRAY_LENGTH(array) (sizeof array / sizeof array[0])
static UErrorCode status = U_ZERO_ERROR;
CollationIteratorTest::CollationIteratorTest()

13
icu4c/source/test/intltest/itrbnf.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 1996-2015, International Business Machines Corporation and *
* others. All Rights Reserved. *
* Copyright (C) 1996-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@ -19,6 +19,7 @@
#include "unicode/ustring.h"
#include "unicode/decimfmt.h"
#include "unicode/udata.h"
#include "cmemory.h"
#include "putilimp.h"
#include "testutil.h"
@ -959,7 +960,7 @@ void IntlTestRBNF::TestLLong()
&NEG_TWO_TO_32X5, &TWO_TO_32, &NEG_FIVE
};
const int TUPLE_WIDTH = 3;
const int TUPLE_COUNT = (int)(sizeof(tuples)/sizeof(tuples[0]))/TUPLE_WIDTH;
const int TUPLE_COUNT = UPRV_LENGTHOF(tuples)/TUPLE_WIDTH;
for (int i = 0; i < TUPLE_COUNT; ++i) {
const llong lhs = *tuples[i*TUPLE_WIDTH+0];
const llong rhs = *tuples[i*TUPLE_WIDTH+1];
@ -1039,7 +1040,7 @@ void IntlTestRBNF::TestLLong()
&BIG_FIVEp1, &FIVE, &ONE
};
const int TUPLE_WIDTH = 3;
const int TUPLE_COUNT = (int)(sizeof(tuples)/sizeof(tuples[0]))/TUPLE_WIDTH;
const int TUPLE_COUNT = UPRV_LENGTHOF(tuples)/TUPLE_WIDTH;
for (int i = 0; i < TUPLE_COUNT; ++i) {
const llong lhs = *tuples[i*TUPLE_WIDTH+0];
const llong rhs = *tuples[i*TUPLE_WIDTH+1];
@ -1813,7 +1814,7 @@ IntlTestRBNF::TestLocalizations(void)
"<<%main>,<'en', \"it's ok\">>", // double quotes work too
" \n <\n <\n %main\n >\n , \t <\t en\t , \tfoo \t\t > \n\n > \n ", // Pattern_White_Space ok
};
int32_t goodLocsLen = sizeof(goodLocs)/sizeof(goodLocs[0]);
int32_t goodLocsLen = UPRV_LENGTHOF(goodLocs);
static const char* badLocs[] = {
" ", // non-zero length
@ -1840,7 +1841,7 @@ IntlTestRBNF::TestLocalizations(void)
"<<%main>> x", // extra non-space text at end
};
int32_t badLocsLen = sizeof(badLocs)/sizeof(badLocs[0]);
int32_t badLocsLen = UPRV_LENGTHOF(badLocs);
for (i = 0; i < goodLocsLen; ++i) {
logln("[%d] '%s'", i, goodLocs[i]);

7
icu4c/source/test/intltest/jamotest.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2010, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************
************************************************************************
@ -16,6 +16,7 @@
#include "jamotest.h"
#include "unicode/utypes.h"
#include "unicode/translit.h"
#include "cmemory.h"
#include "cpdtrans.h"
// SEP is the disambiguation separator used by Latin-Jamo and Jamo-Latin
@ -128,7 +129,7 @@ JamoTest::TestJamo() {
"karka", "(Ki)(A)(L)(Ki)(A)", "kalka",
};
enum { CASE_length = sizeof(CASE) / sizeof(CASE[0]) };
enum { CASE_length = UPRV_LENGTHOF(CASE) };
int32_t i;
for (i=0; i<CASE_length; i+=3) {
@ -367,7 +368,7 @@ JamoTest::TestRealText() {
"\\ucc38\\uc870\\ud558\\uc2ed\\uc2dc\\uc624."
};
enum { WHAT_IS_UNICODE_length = sizeof(WHAT_IS_UNICODE) / sizeof(WHAT_IS_UNICODE[0]) };
enum { WHAT_IS_UNICODE_length = UPRV_LENGTHOF(WHAT_IS_UNICODE) };
UParseError parseError;
UErrorCode status = U_ZERO_ERROR;

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