From be01aa06c2e3f0877ca7cb3ed20f3ec6162ba4e9 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 31 May 2001 23:07:40 +0000 Subject: [PATCH] ICU-900 Fixed some compiler warnings. X-SVN-Rev: 4857 --- icu4c/source/test/cintltst/cstrtest.c | 1 + icu4c/source/test/cintltst/mstrmtst.c | 2 ++ icu4c/source/test/cintltst/putiltst.c | 15 +++++++-------- icu4c/source/test/cintltst/stdnmtst.c | 3 +-- icu4c/source/test/cintltst/ucmptst.c | 3 +-- icu4c/source/test/cintltst/utf8tst.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/icu4c/source/test/cintltst/cstrtest.c b/icu4c/source/test/cintltst/cstrtest.c index a46751f90f0..041f1ec4f3a 100644 --- a/icu4c/source/test/cintltst/cstrtest.c +++ b/icu4c/source/test/cintltst/cstrtest.c @@ -19,6 +19,7 @@ #include "cmemory.h" static void TestAPI(void); +void addCStringTest(TestNode** root); void addCStringTest(TestNode** root) { diff --git a/icu4c/source/test/cintltst/mstrmtst.c b/icu4c/source/test/cintltst/mstrmtst.c index 5ba3e71e0cd..1731d28bec8 100644 --- a/icu4c/source/test/cintltst/mstrmtst.c +++ b/icu4c/source/test/cintltst/mstrmtst.c @@ -22,6 +22,8 @@ static void TestMemoryStreamAPI(void); static void printUSeqErr(const uint8_t *a, int len); +void addMemoryStreamTest(TestNode** root); + static void printUSeqErr(const uint8_t *a, int len) { int i=0; diff --git a/icu4c/source/test/cintltst/putiltst.c b/icu4c/source/test/cintltst/putiltst.c index f291bcd20dd..324141a584a 100644 --- a/icu4c/source/test/cintltst/putiltst.c +++ b/icu4c/source/test/cintltst/putiltst.c @@ -13,11 +13,9 @@ ******************************************************************************* */ -#include -#include -#include #include "unicode/utypes.h" #include "cintltst.h" +#include "cmemory.h" #include "unicode/putil.h" #include "unicode/ustring.h" @@ -27,6 +25,7 @@ static void remainderTest(double x, double y, double exp); static void doAssert(double expect, double got, const char *message); static UBool compareWithNAN(double x, double y); +void addPUtilTest(TestNode** root); void addPUtilTest(TestNode** root) @@ -58,7 +57,7 @@ static void TestPUtilAPI(){ expn1, n1, expy1, y1); } if(VERBOSITY){ - printf("[float] x = %f n = %f y = %f\n", value1, n1, y1); + log_verbose("[float] x = %f n = %f y = %f\n", value1, n1, y1); } log_verbose("Testing the API uprv_fmod()\n"); expn1=uprv_fmod(30.50, 15.00); @@ -232,7 +231,7 @@ static void TestPUtilAPI(){ /*dataDirectory=u_getDataDirectory();*/ dataDirectory="directory1"; /*no backslashes*/ - udataDir=(UChar*)malloc(sizeof(UChar) * (strlen(dataDirectory) + 1)); + udataDir=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(dataDirectory) + 1)); u_charsToUChars(dataDirectory, udataDir, (strlen(dataDirectory)+1)); u_uastrcpy(temp, dataDirectory); @@ -240,14 +239,14 @@ static void TestPUtilAPI(){ log_err("ERROR: u_charsToUChars failed. Expected %s, Got %s\n", austrdup(temp), austrdup(udataDir)); } log_verbose("Testing UChars to chars\n"); - charvalue=(char*)malloc(sizeof(char) * (u_strlen(udataDir) + 1)); + charvalue=(char*)uprv_malloc(sizeof(char) * (u_strlen(udataDir) + 1)); u_UCharsToChars(udataDir, charvalue, (u_strlen(udataDir)+1)); if(strcmp(charvalue, dataDirectory) != 0){ log_err("ERROR: u_UCharsToChars failed. Expected %s, Got %s\n", charvalue, dataDirectory); } - free(charvalue); - free(udataDir); + uprv_free(charvalue); + uprv_free(udataDir); } log_verbose("Testing uprv_timezone()....\n"); diff --git a/icu4c/source/test/cintltst/stdnmtst.c b/icu4c/source/test/cintltst/stdnmtst.c index 4b8307df800..d3b2007e8d9 100644 --- a/icu4c/source/test/cintltst/stdnmtst.c +++ b/icu4c/source/test/cintltst/stdnmtst.c @@ -17,10 +17,9 @@ #include "cstring.h" #include "cintltst.h" -#include - static void TestStandardNames(void); +void addStandardNamesTest(TestNode** root); void diff --git a/icu4c/source/test/cintltst/ucmptst.c b/icu4c/source/test/cintltst/ucmptst.c index ca3bf863e84..df66a6b8f78 100644 --- a/icu4c/source/test/cintltst/ucmptst.c +++ b/icu4c/source/test/cintltst/ucmptst.c @@ -19,14 +19,13 @@ #include "ucmp32.h" #include "cmemory.h" #include "cintltst.h" -#include - static void TestUCMP16API(void); static void TestUCMP8API(void); static void TestUCMP32API(void); +void addCompactArrayTest(TestNode** root); void diff --git a/icu4c/source/test/cintltst/utf8tst.c b/icu4c/source/test/cintltst/utf8tst.c index ea387f09605..981de903903 100644 --- a/icu4c/source/test/cintltst/utf8tst.c +++ b/icu4c/source/test/cintltst/utf8tst.c @@ -30,7 +30,7 @@ static void TestFwdBack(void); static void TestSetChar(void); static void TestAppendChar(void); - +void addUTF8Test(TestNode** root); void addUTF8Test(TestNode** root)