ICU-3905 Fix some compiler warnings.

X-SVN-Rev: 16649
This commit is contained in:
George Rhoten 2004-10-28 00:05:24 +00:00
parent 85c0552e8f
commit 23b78bf15e
4 changed files with 7 additions and 9 deletions

View file

@ -534,7 +534,6 @@ static void TestConvert()
for (codepage_index=0; codepage_index < NUM_CODEPAGE; ++codepage_index)
{
int32_t i = 0;
char* index = NULL;
err = U_ZERO_ERROR;
#ifdef U_TOPSRCDIR
@ -547,10 +546,12 @@ static void TestConvert()
return;
}
index=strrchr(ucs_file_name,(char)U_FILE_SEP_CHAR);
{
char* index = strrchr(ucs_file_name,(char)U_FILE_SEP_CHAR);
if((unsigned int)(index-ucs_file_name) != (strlen(ucs_file_name)-1)){
*(index+1)=0;
if((unsigned int)(index-ucs_file_name) != (strlen(ucs_file_name)-1)){
*(index+1)=0;
}
}
strcat(ucs_file_name,".."U_FILE_SEP_STRING);

View file

@ -1231,7 +1231,7 @@ const char* IntlTest::getTestDataPath(UErrorCode& err) {
}
/* Returns the path to icu/source/test/testdata/ */
const char *IntlTest::getSourceTestData(UErrorCode& err) {
const char *IntlTest::getSourceTestData(UErrorCode& /*err*/) {
const char *srcDataDir = NULL;
#ifdef U_TOPSRCDIR
srcDataDir = U_TOPSRCDIR U_FILE_SEP_STRING"test"U_FILE_SEP_STRING"testdata"U_FILE_SEP_STRING;

View file

@ -1213,7 +1213,6 @@ void MultithreadTest::TestCollators()
FILE *testFile = NULL;
char testDataPath[1024];
strcpy(testDataPath, IntlTest::getSourceTestData(status));
char* index = 0;
if (U_FAILURE(status)) {
errln("ERROR: could not open test data %s", u_errorName(status));
return;

View file

@ -40,9 +40,7 @@
/* data --------------------------------------------------------------------- */
static UNewTrie *trie;
uint32_t *pv;
static int32_t pvCount;
UBool beVerbose=FALSE, haveCopyright=TRUE;
@ -347,7 +345,7 @@ isToken(const char *token, const char *s) {
return FALSE;
}
U_CFUNC int32_t
static int32_t
getTokenIndex(const char *const tokens[], int32_t countTokens, const char *s) {
const char *t, *z;
int32_t i, j;