kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings in CMake source code.

Browse Source
This commit is contained in:
David Cole 2009-10-02 15:30:01 -04:00
parent 837364cb04
commit ccb0cf1306
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@ -251,7 +251,8 @@ bool cmCTestMultiProcessHandler::CheckOutput()
this->TestRunningMap[test] = false; this->TestRunningMap[test] = false;
this->RunningTests.erase(p); this->RunningTests.erase(p);
this->WriteCheckpoint(test); this->WriteCheckpoint(test);
this->WriteCostData(test, p->GetTestResults().ExecutionTime); this->WriteCostData(test, static_cast<float>(
p->GetTestResults().ExecutionTime));
this->RunningCount -= GetProcessorsUsed(test); this->RunningCount -= GetProcessorsUsed(test);
delete p; delete p;
} }
@ -276,7 +277,7 @@ void cmCTestMultiProcessHandler::ReadCostData()
cmSystemTools::SplitString(line.c_str(), ' '); cmSystemTools::SplitString(line.c_str(), ' ');
int index = atoi(parts[0].c_str()); int index = atoi(parts[0].c_str());
float cost = atof(parts[1].c_str()); float cost = static_cast<float>(atof(parts[1].c_str()));
if(this->Properties[index] && this->Properties[index]->Cost == 0) if(this->Properties[index] && this->Properties[index]->Cost == 0)
{ {
this->Properties[index]->Cost = cost; this->Properties[index]->Cost = cost;

10
Source/CTest/cmCTestTestHandler.cxx
View File

@ -574,16 +574,16 @@ int cmCTestTestHandler::ProcessHandler()
} }
} }
float percent = float(passed.size()) * 100.0f / total; float percent = float(passed.size()) * 100.0f / float(total);
if ( failed.size() > 0 && percent > 99) if ( failed.size() > 0 && percent > 99)
{ {
percent = 99; percent = 99;
} }
cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl
<< static_cast<int>(percent + .5) << "% tests passed, " << static_cast<int>(percent + .5) << "% tests passed, "
<< failed.size() << " tests failed out of " << failed.size() << " tests failed out of "
<< total << std::endl); << total << std::endl);
if(this->CTest->GetLabelSummary()) if(this->CTest->GetLabelSummary())
{ {
this->PrintLabelSummary(); this->PrintLabelSummary();
@ -1982,7 +1982,7 @@ bool cmCTestTestHandler::SetTestsProperties(
} }
if ( key == "COST" ) if ( key == "COST" )
{ {
rtit->Cost = atof(val.c_str()); rtit->Cost = static_cast<float>(atof(val.c_str()));
} }
if ( key == "RUN_SERIAL" ) if ( key == "RUN_SERIAL" )
{ {

6
Source/cmHexFileConverter.cxx
View File

@ -172,8 +172,10 @@ cmHexFileConverter::FileType cmHexFileConverter::DetermineFileType(
return Binary; return Binary;
} }
buf[0] = 0; if(!fgets(buf, 1024, inFile))
(void) fgets(buf, 1024, inFile); {
buf[0] = 0;
}
fclose(inFile); fclose(inFile);
FileType type = Binary; FileType type = Binary;
unsigned int minLineLength = 0; unsigned int minLineLength = 0;

12
Source/cmSystemTools.cxx
View File

@ -915,8 +915,10 @@ bool RunCommandViaPopen(const char* command,
#endif #endif
return false; return false;
} }
buffer[0] = 0; if (!fgets(buffer, BUFFER_SIZE, cpipe))
(void) fgets(buffer, BUFFER_SIZE, cpipe); {
buffer[0] = 0;
}
while(!feof(cpipe)) while(!feof(cpipe))
{ {
if(verbose) if(verbose)
@ -924,8 +926,10 @@ bool RunCommandViaPopen(const char* command,
cmSystemTools::Stdout(buffer); cmSystemTools::Stdout(buffer);
} }
output += buffer; output += buffer;
buffer[0] = 0; if(!fgets(buffer, BUFFER_SIZE, cpipe))
(void) fgets(buffer, BUFFER_SIZE, cpipe); {
buffer[0] = 0;
}
} }
retVal = pclose(cpipe); retVal = pclose(cpipe);

12
Source/cmakewizard.cxx
View File

@ -28,8 +28,10 @@ void cmakewizard::AskUser(const char* key,
printf("Current Value: %s\n", iter.GetValue()); printf("Current Value: %s\n", iter.GetValue());
printf("New Value (Enter to keep current value): "); printf("New Value (Enter to keep current value): ");
char buffer[4096]; char buffer[4096];
buffer[0] = 0; if(!fgets(buffer, sizeof(buffer)-1, stdin))
(void) fgets(buffer, sizeof(buffer)-1, stdin); {
buffer[0] = 0;
}
if(strlen(buffer) > 0) if(strlen(buffer) > 0)
{ {
@ -65,8 +67,10 @@ bool cmakewizard::AskAdvanced()
{ {
printf("Would you like to see advanced options? [No]:"); printf("Would you like to see advanced options? [No]:");
char buffer[4096]; char buffer[4096];
buffer[0] = 0; if(!fgets(buffer, sizeof(buffer)-1, stdin))
(void) fgets(buffer, sizeof(buffer)-1, stdin); {
buffer[0] = 0;
}
if(buffer[0]) if(buffer[0])
{ {
if(buffer[0] == 'y' || buffer[0] == 'Y') if(buffer[0] == 'y' || buffer[0] == 'Y')