From 4397926a333e2e8e803b7f757839a95ad5e77ab2 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Tue, 25 Jul 2006 02:52:22 +0000 Subject: [PATCH] ICU-4707 Fix some compiler warnings. X-SVN-Rev: 19885 --- icu4c/source/test/cintltst/ccapitst.c | 6 ++++-- icu4c/source/test/cintltst/cmsccoll.c | 2 +- icu4c/source/test/cintltst/cnumtst.c | 2 +- icu4c/source/test/cintltst/custrtrn.c | 12 ++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/icu4c/source/test/cintltst/ccapitst.c b/icu4c/source/test/cintltst/ccapitst.c index fe32e953a6a..b276c4ba87d 100644 --- a/icu4c/source/test/cintltst/ccapitst.c +++ b/icu4c/source/test/cintltst/ccapitst.c @@ -3077,9 +3077,11 @@ compareNames(const char **names) { relation=*names++; if(*relation=='=') { - rel=0; + rel = 0; } else if(*relation=='<') { - rel=-1; + rel = -1; + } else { + rel = 1; } name1=*names++; diff --git a/icu4c/source/test/cintltst/cmsccoll.c b/icu4c/source/test/cintltst/cmsccoll.c index 69f99c9ad74..d3ad205bbfe 100644 --- a/icu4c/source/test/cintltst/cmsccoll.c +++ b/icu4c/source/test/cintltst/cmsccoll.c @@ -4689,7 +4689,7 @@ TestJ4960(void) static void TestJ5223(void) { - char *test = "this is a test string"; + static const char *test = "this is a test string"; UChar ustr[256]; int32_t ustr_length = u_unescape(test, ustr, 256); unsigned char sortkey[256]; diff --git a/icu4c/source/test/cintltst/cnumtst.c b/icu4c/source/test/cintltst/cnumtst.c index 4f23dbe211a..cc366b9cce6 100644 --- a/icu4c/source/test/cintltst/cnumtst.c +++ b/icu4c/source/test/cintltst/cnumtst.c @@ -97,7 +97,7 @@ static void TestNumberFormat() int32_t resultlength; int32_t resultlengthneeded; int32_t parsepos; - double d1; + double d1 = -1.0; int32_t l1; double d = -10456.37; double a = 1234.56, a1 = 1235.0; diff --git a/icu4c/source/test/cintltst/custrtrn.c b/icu4c/source/test/cintltst/custrtrn.c index 081b89abb75..029e22d09b1 100644 --- a/icu4c/source/test/cintltst/custrtrn.c +++ b/icu4c/source/test/cintltst/custrtrn.c @@ -285,7 +285,7 @@ static void Test_UChar_UTF8_API(void){ u8Target = (char*) malloc (sizeof(uint8_t) * (u8DestLen+1)); u8TargetLength = u8DestLen; - u8Target[u8TargetLength] = 0xfe; + u8Target[u8TargetLength] = (char)0xfe; u8DestLen = -1; u_strToUTF8(u8Target,u8TargetLength, &u8DestLen, uSrc, uSrcLen,&err); if(U_FAILURE(err) || u8DestLen != u8TargetLength || u8Target[u8TargetLength] != (char)0xfe){ @@ -497,7 +497,7 @@ static void Test_UChar_UTF8_API(void){ /* to UTF-8 with length */ err=U_ZERO_ERROR; numSubstitutions=-1; - out8[0]=0xf5; + out8[0]=(char)0xf5; u8DestLen=0; u_strToUTF8WithSub(out8, LENGTHOF(out8), &u8DestLen, withTrail16, u_strlen(withTrail16), @@ -512,7 +512,7 @@ static void Test_UChar_UTF8_API(void){ /* to UTF-8 with NUL termination */ err=U_ZERO_ERROR; numSubstitutions=-1; - out8[0]=0xf5; + out8[0]=(char)0xf5; u8DestLen=0; u_strToUTF8WithSub(out8, LENGTHOF(out8), &u8DestLen, withTrail16, -1, @@ -527,7 +527,7 @@ static void Test_UChar_UTF8_API(void){ /* preflight to UTF-8 with NUL termination */ err=U_ZERO_ERROR; numSubstitutions=-1; - out8[0]=0xf5; + out8[0]=(char)0xf5; u8DestLen=0; u_strToUTF8WithSub(out8, 1, &u8DestLen, withTrail16, -1, @@ -558,7 +558,7 @@ static void Test_UChar_UTF8_API(void){ /* to UTF-8 with length (just first UChar which is valid) */ err=U_ZERO_ERROR; numSubstitutions=-1; - out8[0]=0xf5; + out8[0]=(char)0xf5; u8DestLen=0; u_strToUTF8WithSub(out8, LENGTHOF(out8), &u8DestLen, withTrail16, 1, @@ -590,7 +590,7 @@ static void Test_UChar_UTF8_API(void){ /* to UTF-8 with length (just first UChar which is valid) */ err=U_ZERO_ERROR; numSubstitutions=-1; - out8[0]=0xf5; + out8[0]=(char)0xf5; u8DestLen=0; u_strToUTF8WithSub(out8, LENGTHOF(out8), &u8DestLen, withTrail16, 1,