AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-3222 Fix some compiler warnings

Browse Source 
X-SVN-Rev: 14241
This commit is contained in:
George Rhoten 2004-01-06 21:52:08 +00:00
parent e2242d1091
commit 9feda477f4
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/common/rbbitblb.cpp
View File

@ -323,7 +323,7 @@ void RBBITableBuilder::calcFollowPos(RBBINode *n) {
// to implement rule chaining. NOT described by Aho
//
//-----------------------------------------------------------------------------
void RBBITableBuilder::calcChainedFollowPos(RBBINode *fTree) {
void RBBITableBuilder::calcChainedFollowPos(RBBINode *tree) {
UVector endMarkerNodes(*fStatus);
UVector leafNodes(*fStatus);
@ -334,16 +334,16 @@ void RBBITableBuilder::calcChainedFollowPos(RBBINode *fTree) {
}
// get a list of all endmarker nodes.
fTree->findNodes(&endMarkerNodes, RBBINode::endMark, *fStatus);
tree->findNodes(&endMarkerNodes, RBBINode::endMark, *fStatus);
// get a list all leaf nodes
fTree->findNodes(&leafNodes, RBBINode::leafChar, *fStatus);
tree->findNodes(&leafNodes, RBBINode::leafChar, *fStatus);
if (U_FAILURE(*fStatus)) {
return;
}
// Get all nodes that can be the start a match, which is FirstPosition(root)
UVector *matchStartNodes = fTree->fFirstPosSet;
UVector *matchStartNodes = tree->fFirstPosSet;
// Iteratate over all leaf nodes,

16
icu4c/source/test/intltest/testidna.cpp
View File

@ -1643,24 +1643,24 @@ void TestIDNA::TestDataFile(){
testData(*this);
}
TestIDNA::~TestIDNA(){
if(prep!=NULL){
delete prep;
prep = NULL;
if(gPrep!=NULL){
delete gPrep;
gPrep = NULL;
}
}
NamePrepTransform* TestIDNA::prep = NULL;
NamePrepTransform* TestIDNA::gPrep = NULL;
NamePrepTransform* TestIDNA::getInstance(UErrorCode& status){
if(TestIDNA::prep == NULL){
if(TestIDNA::gPrep == NULL){
UParseError parseError;
TestIDNA::prep = NamePrepTransform::createInstance(parseError, status);
if(TestIDNA::prep ==NULL){
TestIDNA::gPrep = NamePrepTransform::createInstance(parseError, status);
if(TestIDNA::gPrep ==NULL){
//status = U_MEMORY_ALLOCATION_ERROR;
return NULL;
}
}
return TestIDNA::prep;
return TestIDNA::gPrep;
}
#endif /* #if !UCONFIG_NO_IDNA */

2
icu4c/source/test/intltest/testidna.h
View File

@ -64,7 +64,7 @@ public:
void TestIDNAMonkeyTest();
void TestConformance();
static NamePrepTransform* getInstance(UErrorCode& status);
static NamePrepTransform* prep;
static NamePrepTransform* gPrep;
virtual ~TestIDNA();
private:

2
icu4c/source/tools/pkgdata/pkgdata.c
View File

@ -605,7 +605,7 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
}
/* Try calling icu-config directly to get information */
void fillInMakefileFromICUConfig(UOption *option)
static void fillInMakefileFromICUConfig(UOption *option)
{
#if U_HAVE_POPEN
FILE *p;