From 23b78bf15e842adb4063cb5c62ba2f0ede17eb6d Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Thu, 28 Oct 2004 00:05:24 +0000
Subject: [PATCH] ICU-3905 Fix some compiler warnings.

X-SVN-Rev: 16649
---
 icu4c/source/test/cintltst/ccapitst.c   | 9 +++++----
 icu4c/source/test/intltest/intltest.cpp | 2 +-
 icu4c/source/test/intltest/tsmthred.cpp | 1 -
 icu4c/source/tools/gencase/gencase.c    | 4 +---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/icu4c/source/test/cintltst/ccapitst.c b/icu4c/source/test/cintltst/ccapitst.c
index b42c66532ee..7a7ba171747 100644
--- a/icu4c/source/test/cintltst/ccapitst.c
+++ b/icu4c/source/test/cintltst/ccapitst.c
@@ -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);
diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp
index 0c629919349..a111316614e 100644
--- a/icu4c/source/test/intltest/intltest.cpp
+++ b/icu4c/source/test/intltest/intltest.cpp
@@ -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;
diff --git a/icu4c/source/test/intltest/tsmthred.cpp b/icu4c/source/test/intltest/tsmthred.cpp
index 886fe88d3f5..e203b7684d2 100644
--- a/icu4c/source/test/intltest/tsmthred.cpp
+++ b/icu4c/source/test/intltest/tsmthred.cpp
@@ -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;
diff --git a/icu4c/source/tools/gencase/gencase.c b/icu4c/source/tools/gencase/gencase.c
index 754ec49ee89..a49b73c1296 100644
--- a/icu4c/source/tools/gencase/gencase.c
+++ b/icu4c/source/tools/gencase/gencase.c
@@ -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;