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

ICU-20601 Remove superfluous semicolons (-Wextra-semi-stmt).

Browse Source
This commit is contained in:
Fredrik Roubert 2019-08-07 20:56:02 +02:00 committed by Fredrik Roubert
parent ca6480832e
commit 17606e0345
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/utrie.h
View File

@ -199,7 +199,7 @@ typedef struct UTrie UTrie;
/** Internal trie getter from a BMP code point, treating a lead surrogate as a normal code point */
#define _UTRIE_GET_FROM_BMP(trie, data, c16) \
_UTRIE_GET_RAW(trie, data, 0xd800<=(c16) && (c16)<=0xdbff ? UTRIE_LEAD_INDEX_DISP : 0, c16);
_UTRIE_GET_RAW(trie, data, 0xd800<=(c16) && (c16)<=0xdbff ? UTRIE_LEAD_INDEX_DISP : 0, c16)
/**
* Internal trie getter from a code point.

4
icu4c/source/samples/cal/cal.c
View File

@ -697,7 +697,7 @@ print_year(UCalendar *c,
if(left_current == 0) {
break;
}
};
}
/* If the current day isn't 0, indent to make up for missing
days at the end of the month */
@ -745,7 +745,7 @@ print_year(UCalendar *c,
break;
}
};
}
/* Output a newline */
putc('\n', stdout);

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

@ -219,7 +219,7 @@ UBool hasCollationElements(const char *locName) {
UErrorCode status = U_ZERO_ERROR;
UResourceBundle *loc = ures_open(U_ICUDATA_NAME U_TREE_SEPARATOR_STRING "coll", locName, &status);;
UResourceBundle *loc = ures_open(U_ICUDATA_NAME U_TREE_SEPARATOR_STRING "coll", locName, &status);
if(U_SUCCESS(status)) {
status = U_ZERO_ERROR;

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

@ -849,7 +849,7 @@ void TestCloneBinary(){
ucol_getSortKey(col, t, -1, k2, l2);
if (strcmp((char *)k1,(char *)k2) != 0){
log_err("ucol_openBinary - new collator should equal to old one\n");
};
}
free(k1);
free(k2);
}

4
icu4c/source/test/cintltst/cbiapts.c
View File

@ -99,7 +99,7 @@ static UChar* toUChar(const char *src, void **freeHook) {
UErrorCode status = U_ZERO_ERROR;
if (src == NULL) {
return NULL;
};
}
cnv = ucnv_open(NULL, &status);
if(U_FAILURE(status) || cnv == NULL) {
@ -532,7 +532,7 @@ static UBreakIterator * testOpenRules(char *rules) {
if (U_FAILURE(status)) {
log_data_err("FAIL: ubrk_openRules: ICU Error \"%s\" (Are you missing data?)\n", u_errorName(status));
bi = 0;
};
}
freeToUCharStrings(&strCleanUp);
return bi;

8
icu4c/source/test/cintltst/ccaltst.c
View File

@ -935,7 +935,7 @@ static void TestAddRollExtensive()
u_uastrcpy(tzID, "PST");
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);;
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);
if (U_FAILURE(status)) {
log_data_err("ucal_open() failed : %s - (Are you missing data?)\n", u_errorName(status));
return;
@ -1123,7 +1123,7 @@ static void TestGetLimits()
u_uastrcpy(tzID, "PST");
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);;
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);
if (U_FAILURE(status)) {
log_data_err("ucal_open() for gregorian calendar failed in TestGetLimits: %s - (Are you missing data?)\n", u_errorName(status));
return;
@ -1221,7 +1221,7 @@ static void TestDOWProgression()
char tempMsgBuf[256];
u_strcpy(tzID, fgGMTID);
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);;
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
if (U_FAILURE(status)) {
log_data_err("ucal_open failed: %s - (Are you missing data?)\n", u_errorName(status));
return;
@ -1294,7 +1294,7 @@ static void testZones(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_t mn
char tempMsgBuf[256];
u_strcpy(tzID, fgGMTID);
gmtcal=ucal_open(tzID, 3, "en_US", UCAL_TRADITIONAL, &status);;
gmtcal=ucal_open(tzID, 3, "en_US", UCAL_TRADITIONAL, &status);
if (U_FAILURE(status)) {
log_data_err("ucal_open failed: %s - (Are you missing data?)\n", u_errorName(status));
return;

6
icu4c/source/test/cintltst/cnumtst.c
View File

@ -498,7 +498,7 @@ free(result);
pattern=unum_open(UNUM_IGNORE,temp1, u_strlen(temp1), NULL, NULL,&status);
if(U_FAILURE(status))
{
log_err("error in unum_openPattern(): %s\n", myErrorName(status) );;
log_err("error in unum_openPattern(): %s\n", myErrorName(status) );
}
else
log_verbose("Pass: unum_openPattern() works fine\n");
@ -1323,7 +1323,7 @@ static void TestNumberFormatPadding()
pattern=unum_open(UNUM_IGNORE,temp1, u_strlen(temp1), "en_US",NULL, &status);
if(U_FAILURE(status))
{
log_err_status(status, "error in padding unum_openPattern(%s): %s\n", temp1, myErrorName(status) );;
log_err_status(status, "error in padding unum_openPattern(%s): %s\n", temp1, myErrorName(status) );
}
else {
log_verbose("Pass: padding unum_openPattern() works fine\n");
@ -1625,7 +1625,7 @@ static void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
/* set the default ruleset to the first one found, and retry */
if (len > 0) {
for (i = 0; i < len && temp[i] != ';'; ++i){};
for (i = 0; i < len && temp[i] != ';'; ++i){}
if (i < len) {
buffer[i] = 0;
unum_setTextAttribute(fmt, UNUM_DEFAULT_RULESET, buffer, -1, &status);

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

@ -534,7 +534,7 @@ TestOpenDirect(void) {
}
ures_close(idna_rules);
errorCode = U_USING_FALLBACK_WARNING;;
errorCode = U_USING_FALLBACK_WARNING;
idna_rules=ures_openDirect("testdata", "idna_rules", &errorCode);
if(U_FAILURE(errorCode)) {
log_data_err("ures_openDirect(\"idna_rules\") failed when U_USING_FALLBACK_WARNING was set prior to call: %s\n", u_errorName(errorCode));

8
icu4c/source/test/cintltst/cstrtest.c
View File

@ -117,10 +117,10 @@ static void TestAPI(void)
log_err("FAIL: uprv_stricmp() where the second string is null failed. Expected: 1, returned %d\n", intValue);
}
if((intValue=uprv_stricmp(NULL, NULL)) != 0){
log_err("FAIL: uprv_stricmp(NULL, NULL) failed. Expected: 0, returned %d\n", intValue);;
log_err("FAIL: uprv_stricmp(NULL, NULL) failed. Expected: 0, returned %d\n", intValue);
}
if((intValue=uprv_stricmp("", "")) != 0){
log_err("FAIL: uprv_stricmp(\"\", \"\") failed. Expected: 0, returned %d\n", intValue);;
log_err("FAIL: uprv_stricmp(\"\", \"\") failed. Expected: 0, returned %d\n", intValue);
}
if((intValue=uprv_stricmp("", "abc")) != -1){
log_err("FAIL: uprv_stricmp(\"\", \"abc\") failed. Expected: -1, returned %d\n", intValue);
@ -146,10 +146,10 @@ static void TestAPI(void)
log_err("FAIL: uprv_strnicmp() where the second string is null failed. Expected: 1, returned %d\n", intValue);
}
if((intValue=uprv_strnicmp(NULL, NULL, 10)) != 0){
log_err("FAIL: uprv_strnicmp(NULL, NULL, 10) failed. Expected: 0, returned %d\n", intValue);;
log_err("FAIL: uprv_strnicmp(NULL, NULL, 10) failed. Expected: 0, returned %d\n", intValue);
}
if((intValue=uprv_strnicmp("", "", 10)) != 0){
log_err("FAIL: uprv_strnicmp(\"\", \"\") failed. Expected: 0, returned %d\n", intValue);;
log_err("FAIL: uprv_strnicmp(\"\", \"\") failed. Expected: 0, returned %d\n", intValue);
}
if((intValue=uprv_strnicmp("", "abc", 10)) != -1){
log_err("FAIL: uprv_stricmp(\"\", \"abc\", 10) failed. Expected: -1, returned %d\n", intValue);

10
icu4c/source/test/cintltst/nccbtst.c
View File

@ -914,7 +914,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, UPRV_LENGTHOF(sampleText1),
expected1, UPRV_LENGTHOF(expected1),"utf8",
UCNV_TO_U_CALLBACK_SKIP, offsets1, NULL, 0 ))
log_err("utf8->u with skip did not match.\n");;
log_err("utf8->u with skip did not match.\n");
}
log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_SKIP \n");
@ -1330,7 +1330,7 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, UPRV_LENGTHOF(sampleText1),
expected1, UPRV_LENGTHOF(expected1),"utf8",
UCNV_TO_U_CALLBACK_STOP, offsets1, NULL, 0 ))
log_err("utf8->u with stop did not match.\n");;
log_err("utf8->u with stop did not match.\n");
}
log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_STOP \n");
{
@ -1341,7 +1341,7 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, UPRV_LENGTHOF(sampleText1),
expected1, UPRV_LENGTHOF(expected1),"SCSU",
UCNV_TO_U_CALLBACK_STOP, offsets1, NULL, 0 ))
log_err("scsu->u with stop did not match.\n");;
log_err("scsu->u with stop did not match.\n");
}
}
@ -1620,7 +1620,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, UPRV_LENGTHOF(sampleText1),
expected1, UPRV_LENGTHOF(expected1),"utf8",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0 ))
log_err("utf8->u with substitute did not match.\n");;
log_err("utf8->u with substitute did not match.\n");
}
log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_SUBSTITUTE \n");
{
@ -1631,7 +1631,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, UPRV_LENGTHOF(sampleText1),
expected1, UPRV_LENGTHOF(expected1),"SCSU",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0 ))
log_err("scsu->u with stop did not match.\n");;
log_err("scsu->u with stop did not match.\n");
}
#if !UCONFIG_NO_LEGACY_CONVERSION

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

@ -968,7 +968,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){
if(!testConvertToU(sampleText1, sizeof(sampleText1),
expected1, UPRV_LENGTHOF(expected1),"utf8", UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1,FALSE))
log_err("utf8->u with substitute did not match.\n");;
log_err("utf8->u with substitute did not match.\n");
}
#if !UCONFIG_NO_LEGACY_CONVERSION

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

@ -386,7 +386,7 @@ static void TestSelector()
return;
}
if (!text_open(&text)) {
releaseAvailableNames();;
releaseAvailableNames();
}
excluded_sets[0] = uset_openEmpty();