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

ICU-8602 Fix some compiler warnings.

Browse Source 
X-SVN-Rev: 30231
This commit is contained in:
Michael Ow 2011-06-24 19:12:33 +00:00
parent 38a2ac09cc
commit c2bf97eb02
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,7 +594,7 @@ static void TestConvert()
if (!myConverter || U_FAILURE(err)) if (!myConverter || U_FAILURE(err))
{ {
log_data_err("Error creating the ibm-949 converter - %s \n", u_errorName(err)); log_data_err("Error creating the ibm-949 converter - %s \n", u_errorName(err));
fclose(ucs_file_name); fclose(ucs_file_in);
break; break;
} }
@ -3346,14 +3346,14 @@ TestToUCountPending(){
} }
ucnv_setToUCallBack(cnv, UCNV_TO_U_CALLBACK_STOP, NULL, oldToUAction, NULL, &status); ucnv_setToUCallBack(cnv, UCNV_TO_U_CALLBACK_STOP, NULL, oldToUAction, NULL, &status);
for(i=0; i<LENGTHOF(toUnicodeTests); ++i) { for(i=0; i<LENGTHOF(toUnicodeTests); ++i) {
UChar tgt[10]; UChar tgt[20];
UChar* target = tgt; UChar* target = tgt;
UChar* targetLimit = target + 20; UChar* targetLimit = target + 20;
const char* source = toUnicodeTests[i].input; const char* source = toUnicodeTests[i].input;
const char* sourceLimit = source + toUnicodeTests[i].len; const char* sourceLimit = source + toUnicodeTests[i].len;
int32_t len = 0; int32_t len = 0;
ucnv_reset(cnv); ucnv_reset(cnv);
ucnv_toUnicode(cnv,&target, targetLimit, &source, sourceLimit, NULL, FALSE, &status); ucnv_toUnicode(cnv, &target, targetLimit, &source, sourceLimit, NULL, FALSE, &status);
len = ucnv_toUCountPending(cnv,&status); len = ucnv_toUCountPending(cnv,&status);
if(U_FAILURE(status)){ if(U_FAILURE(status)){
log_err("ucnv_toUnicode call did not succeed. Error: %s\n", u_errorName(status)); log_err("ucnv_toUnicode call did not succeed. Error: %s\n", u_errorName(status));

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

@ -901,7 +901,7 @@ static uint32_t testSwitch(tst_strcoll* func, void *collator, int opts, uint32_t
realResult = func(collator, opts, first, sLen, second, tLen); realResult = func(collator, opts, first, sLen, second, tLen);
realStrength = probeStrength(func, collator, opts, first, sLen, second, tLen, realResult); realStrength = probeStrength(func, collator, opts, first, sLen, second, tLen, realResult);
if(strength == UCOL_IDENTICAL && realResult != UCOL_IDENTICAL) { if(strength == UCOL_IDENTICAL && realResult != UCOL_EQUAL) {
logFailure(msg, "tailoring", first, sLen, second, tLen, realResult, realStrength, UCOL_EQUAL, strength, error); logFailure(msg, "tailoring", first, sLen, second, tLen, realResult, realStrength, UCOL_EQUAL, strength, error);
diffs++; diffs++;
} else if(realResult != UCOL_LESS || realStrength != strength) { } else if(realResult != UCOL_LESS || realStrength != strength) {

1
icu4c/source/tools/genrb/reslist.c
View File

@ -25,6 +25,7 @@
#include "uarrsort.h" #include "uarrsort.h"
#include "uinvchar.h" #include "uinvchar.h"
#include "ustr_imp.h"
/* /*
* Align binary data at a 16-byte offset from the start of the resource bundle, * Align binary data at a 16-byte offset from the start of the resource bundle,