From 0e172ed2e9a7858b9d66da2797136c39a20eaa96 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 22 Aug 2002 20:48:21 +0000 Subject: [PATCH] ICU-2000 Fixed some compiler warnings. X-SVN-Rev: 9770 --- icu4c/source/test/cintltst/capitst.c | 2 +- icu4c/source/test/cintltst/cconvtst.c | 4 +++- icu4c/source/test/cintltst/creststn.c | 4 ++++ icu4c/source/test/cintltst/creststn.h | 2 -- icu4c/source/test/cintltst/ctstdep.c | 5 +++++ icu4c/source/test/cintltst/nucnvtst.c | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/icu4c/source/test/cintltst/capitst.c b/icu4c/source/test/cintltst/capitst.c index f6e0723fbca..1e1c06c0d6b 100644 --- a/icu4c/source/test/cintltst/capitst.c +++ b/icu4c/source/test/cintltst/capitst.c @@ -1337,7 +1337,7 @@ void TestBounds() { ucol_close(coll); } -void doOverrunTest(UCollator *coll, const UChar *uString, int32_t strLen) { +static void doOverrunTest(UCollator *coll, const UChar *uString, int32_t strLen) { int32_t skLen = 0, skLen2 = 0; uint8_t sortKey[256]; int32_t i, j; diff --git a/icu4c/source/test/cintltst/cconvtst.c b/icu4c/source/test/cintltst/cconvtst.c index 5d154fe7b90..c4d431b72a9 100644 --- a/icu4c/source/test/cintltst/cconvtst.c +++ b/icu4c/source/test/cintltst/cconvtst.c @@ -25,8 +25,10 @@ void addExtraTests(TestNode** root); U_CFUNC void addBOCU1Tests(TestNode** root); +void addConvert(TestNode** root); + void addConvert(TestNode** root) -{ +{ addTestConvert(root); addTestNewConvert(root); addBOCU1Tests(root); diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index fdf0c1fee95..f3081b940e2 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -32,6 +32,10 @@ #include "creststn.h" #include "unicode/ctest.h" +#ifdef ICU_URES_USE_DEPRECATES +static void TestConstruction2(void); +#endif + static int32_t pass; static int32_t fail; diff --git a/icu4c/source/test/cintltst/creststn.h b/icu4c/source/test/cintltst/creststn.h index 7a710fa2671..dd1e7376247 100644 --- a/icu4c/source/test/cintltst/creststn.h +++ b/icu4c/source/test/cintltst/creststn.h @@ -32,8 +32,6 @@ static void TestResourceBundles(void); **/ static void TestConstruction1(void); -static void TestConstruction2(void); - static void TestAliasConflict(void); static void TestFallback(void); diff --git a/icu4c/source/test/cintltst/ctstdep.c b/icu4c/source/test/cintltst/ctstdep.c index f6bb20d8c07..56e510abc88 100644 --- a/icu4c/source/test/cintltst/ctstdep.c +++ b/icu4c/source/test/cintltst/ctstdep.c @@ -32,11 +32,16 @@ #include +#ifdef U_USE_DEPRECATED_UCOL_API static void TestDeprecatedCollationAPI(void); +#endif +#ifdef U_USE_DEPRECATED_FORMAT_API static void TestDeprecatedNumFmtAPI(void); static void TestDeprecatedDateFmtAPI(void); static void TestDeprecatedUErrorCode(void); static void TestDeprecatedUCharScript(void); +#endif + const static char cnt1[][10] = { "AA", "AC", diff --git a/icu4c/source/test/cintltst/nucnvtst.c b/icu4c/source/test/cintltst/nucnvtst.c index cbedea5a27e..d92db3f677e 100644 --- a/icu4c/source/test/cintltst/nucnvtst.c +++ b/icu4c/source/test/cintltst/nucnvtst.c @@ -1054,9 +1054,9 @@ static void TestNewConvertWithBufferSizes(int32_t outsize, int32_t insize ) static void TestCoverageMBCS(){ UErrorCode status = U_ZERO_ERROR; - const char *directory = loadTestData(&status); #if 0 + const char *directory = loadTestData(&status); char* tdpath = NULL; char* saveDirectory = (char*)malloc(sizeof(char) *(strlen(u_getDataDirectory())+1)); int len = strlen(directory);