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

Add parentheses around '&&' between '||' for gcc

Browse Source 
The GNU compiler warns about possible operator precedence mistakes and
asks for explicit parentheses (-Wparentheses).  We add the parentheses
to silence the warning.  This also fixes one real logic error in the
find_package() implementation by correcting expression evaluation order.
This commit is contained in:
Brad King 2009-09-11 08:18:15 -04:00
parent e0df0495e5
commit b41a548d86
11 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CPack/cpack.cxx
View File

@ -359,10 +359,11 @@ int main (int argc, char *argv[])
"CPack project name not specified" << std::endl); "CPack project name not specified" << std::endl);
parsed = 0; parsed = 0;
} }
if ( parsed && !(mf->GetDefinition("CPACK_PACKAGE_VERSION") if (parsed &&
|| mf->GetDefinition("CPACK_PACKAGE_VERSION_MAJOR") && !(mf->GetDefinition("CPACK_PACKAGE_VERSION") ||
mf->GetDefinition("CPACK_PACKAGE_VERSION_MINOR") (mf->GetDefinition("CPACK_PACKAGE_VERSION_MAJOR") &&
&& mf->GetDefinition("CPACK_PACKAGE_VERSION_PATCH")) ) mf->GetDefinition("CPACK_PACKAGE_VERSION_MINOR") &&
mf->GetDefinition("CPACK_PACKAGE_VERSION_PATCH"))))
{ {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"CPack project version not specified" << std::endl "CPack project version not specified" << std::endl

8
Source/CTest/cmCTestBuildHandler.cxx
View File

@ -611,8 +611,8 @@ void cmCTestBuildHandler::GenerateXMLLogScraped(std::ostream& os)
it != ew.end() && (numErrorsAllowed || numWarningsAllowed); it++ ) it != ew.end() && (numErrorsAllowed || numWarningsAllowed); it++ )
{ {
cmCTestBuildErrorWarning *cm = &(*it); cmCTestBuildErrorWarning *cm = &(*it);
if (cm->Error && numErrorsAllowed || if ((cm->Error && numErrorsAllowed) ||
!cm->Error && numWarningsAllowed) (!cm->Error && numWarningsAllowed))
{ {
if (cm->Error) if (cm->Error)
{ {
@ -681,8 +681,8 @@ void cmCTestBuildHandler::GenerateXMLLogScraped(std::ostream& os)
<< "</PreContext>\n" << "</PreContext>\n"
<< "\t\t<PostContext>" << cmXMLSafe(cm->PostContext).Quotes(false); << "\t\t<PostContext>" << cmXMLSafe(cm->PostContext).Quotes(false);
// is this the last warning or error, if so notify // is this the last warning or error, if so notify
if (cm->Error && !numErrorsAllowed || if ((cm->Error && !numErrorsAllowed) ||
!cm->Error && !numWarningsAllowed) (!cm->Error && !numWarningsAllowed))
{ {
os << "\nThe maximum number of reported warnings or errors has been " os << "\nThe maximum number of reported warnings or errors has been "
"reached!!!\n"; "reached!!!\n";

20
Source/CursesDialog/cmCursesMainForm.cxx
View File

@ -231,7 +231,8 @@ void cmCursesMainForm::RePost()
{ {
cmCacheManager::CacheIterator mit = cmCacheManager::CacheIterator mit =
this->CMakeInstance->GetCacheManager()->GetCacheIterator((*it)->GetValue()); this->CMakeInstance->GetCacheManager()->GetCacheIterator((*it)->GetValue());
if (mit.IsAtEnd() || !this->AdvancedMode && mit.GetPropertyAsBool("ADVANCED")) if (mit.IsAtEnd() ||
(!this->AdvancedMode && mit.GetPropertyAsBool("ADVANCED")))
{ {
continue; continue;
} }
@ -259,7 +260,8 @@ void cmCursesMainForm::RePost()
{ {
cmCacheManager::CacheIterator mit = cmCacheManager::CacheIterator mit =
this->CMakeInstance->GetCacheManager()->GetCacheIterator((*it)->GetValue()); this->CMakeInstance->GetCacheManager()->GetCacheIterator((*it)->GetValue());
if (mit.IsAtEnd() || !this->AdvancedMode && mit.GetPropertyAsBool("ADVANCED")) if (mit.IsAtEnd() ||
(!this->AdvancedMode && mit.GetPropertyAsBool("ADVANCED")))
{ {
continue; continue;
} }
@ -327,7 +329,8 @@ void cmCursesMainForm::Render(int left, int top, int width, int height)
{ {
cmCacheManager::CacheIterator mit = cmCacheManager::CacheIterator mit =
this->CMakeInstance->GetCacheManager()->GetCacheIterator((*it)->GetValue()); this->CMakeInstance->GetCacheManager()->GetCacheIterator((*it)->GetValue());
if (mit.IsAtEnd() || !this->AdvancedMode && mit.GetPropertyAsBool("ADVANCED")) if (mit.IsAtEnd() ||
(!this->AdvancedMode && mit.GetPropertyAsBool("ADVANCED")))
{ {
continue; continue;
} }
@ -344,7 +347,8 @@ void cmCursesMainForm::Render(int left, int top, int width, int height)
{ {
cmCacheManager::CacheIterator mit = cmCacheManager::CacheIterator mit =
this->CMakeInstance->GetCacheManager()->GetCacheIterator((*it)->GetValue()); this->CMakeInstance->GetCacheManager()->GetCacheIterator((*it)->GetValue());
if (mit.IsAtEnd() || !this->AdvancedMode && mit.GetPropertyAsBool("ADVANCED")) if (mit.IsAtEnd() ||
(!this->AdvancedMode && mit.GetPropertyAsBool("ADVANCED")))
{ {
continue; continue;
} }
@ -914,10 +918,10 @@ void cmCursesMainForm::HandleInput()
this->SearchMode = false; this->SearchMode = false;
} }
*/ */
else if ( key >= 'a' && key <= 'z' || else if ((key >= 'a' && key <= 'z') ||
key >= 'A' && key <= 'Z' || (key >= 'A' && key <= 'Z') ||
key >= '0' && key <= '9' || (key >= '0' && key <= '9') ||
key == '_' ) (key == '_' ))
{ {
if ( this->SearchString.size() < static_cast<std::string::size_type>(x-10) ) if ( this->SearchString.size() < static_cast<std::string::size_type>(x-10) )
{ {

14
Source/cmCMakeMinimumRequired.cxx
View File

@ -87,12 +87,12 @@ bool cmCMakeMinimumRequired
} }
// Compare the version numbers. // Compare the version numbers.
if(current_major < required_major || if((current_major < required_major) ||
current_major == required_major && (current_major == required_major &&
current_minor < required_minor || current_minor < required_minor) ||
current_major == required_major && (current_major == required_major &&
current_minor == required_minor && current_minor == required_minor &&
current_patch < required_patch) current_patch < required_patch))
{ {
// The current version is too low. // The current version is too low.
cmOStringStream e; cmOStringStream e;
@ -110,7 +110,7 @@ bool cmCMakeMinimumRequired
return false; return false;
} }
if (required_major < 2 || required_major == 2 && required_minor < 4) if (required_major < 2 || (required_major == 2 && required_minor < 4))
{ {
this->Makefile->SetPolicyVersion("2.4"); this->Makefile->SetPolicyVersion("2.4");
} }

4
Source/cmExecuteProcessCommand.cxx
View File

@ -298,8 +298,8 @@ bool cmExecuteProcessCommand
while((p = cmsysProcess_WaitForData(cp, &data, &length, 0), p)) while((p = cmsysProcess_WaitForData(cp, &data, &length, 0), p))
{ {
// Put the output in the right place. // Put the output in the right place.
if(p == cmsysProcess_Pipe_STDOUT && !output_quiet || if((p == cmsysProcess_Pipe_STDOUT && !output_quiet) ||
p == cmsysProcess_Pipe_STDERR && !error_quiet && merge_output) (p == cmsysProcess_Pipe_STDERR && !error_quiet && merge_output))
{ {
if(output_variable.empty()) if(output_variable.empty())
{ {

4
Source/cmFileCommand.cxx
View File

@ -590,7 +590,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
{ {
// Ignore CR character to make output always have UNIX newlines. // Ignore CR character to make output always have UNIX newlines.
} }
else if(c >= 0x20 && c < 0x7F || c == '\t' || c == '\f' || else if((c >= 0x20 && c < 0x7F) || c == '\t' || c == '\f' ||
(c == '\n' && newline_consume)) (c == '\n' && newline_consume))
{ {
// This is an ASCII character that may be part of a string. // This is an ASCII character that may be part of a string.
@ -1973,7 +1973,7 @@ bool cmFileInstaller::HandleInstallDestination()
if ( ch1 != '/' ) if ( ch1 != '/' )
{ {
int relative = 0; int relative = 0;
if ( ( ch1 >= 'a' && ch1 <= 'z' || ch1 >= 'A' && ch1 <= 'Z' ) && if (((ch1 >= 'a' && ch1 <= 'z') || (ch1 >= 'A' && ch1 <= 'Z')) &&
ch2 == ':' ) ch2 == ':' )
{ {
// Assume windows // Assume windows

8
Source/cmFindPackageCommand.cxx
View File

@ -900,13 +900,13 @@ void cmFindPackageCommand::FindConfig()
bool found = false; bool found = false;
// Search for frameworks. // Search for frameworks.
if(!found && this->SearchFrameworkFirst || this->SearchFrameworkOnly) if(!found && (this->SearchFrameworkFirst || this->SearchFrameworkOnly))
{ {
found = this->FindFrameworkConfig(); found = this->FindFrameworkConfig();
} }
// Search for apps. // Search for apps.
if(!found && this->SearchAppBundleFirst || this->SearchAppBundleOnly) if(!found && (this->SearchAppBundleFirst || this->SearchAppBundleOnly))
{ {
found = this->FindAppBundleConfig(); found = this->FindAppBundleConfig();
} }
@ -1136,8 +1136,8 @@ void cmFindPackageCommand::AddPrefixesSystemEnvironment()
std::string const& d = *i; std::string const& d = *i;
// If the path is a PREFIX/bin case then add its parent instead. // If the path is a PREFIX/bin case then add its parent instead.
if(d.size() >= 4 && strcmp(d.c_str()+d.size()-4, "/bin") == 0 || if((d.size() >= 4 && strcmp(d.c_str()+d.size()-4, "/bin") == 0) ||
d.size() >= 5 && strcmp(d.c_str()+d.size()-5, "/sbin") == 0) (d.size() >= 5 && strcmp(d.c_str()+d.size()-5, "/sbin") == 0))
{ {
this->AddPathInternal(cmSystemTools::GetFilenamePath(d), EnvPath); this->AddPathInternal(cmSystemTools::GetFilenamePath(d), EnvPath);
} }

2
Source/cmPolicies.cxx
View File

@ -497,7 +497,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
} }
// it is an error if the policy version is less than 2.4 // it is an error if the policy version is less than 2.4
if (majorVer < 2 || majorVer == 2 && minorVer < 4) if (majorVer < 2 || (majorVer == 2 && minorVer < 4))
{ {
mf->IssueMessage(cmake::FATAL_ERROR, mf->IssueMessage(cmake::FATAL_ERROR,
"An attempt was made to set the policy version of CMake to something " "An attempt was made to set the policy version of CMake to something "

6
Source/cmSetCommand.cxx
View File

@ -134,9 +134,9 @@ bool cmSetCommand
// we should be nice and try to catch some simple screwups if the last or // we should be nice and try to catch some simple screwups if the last or
// next to last args are CACHE then they screwed up. If they used FORCE // next to last args are CACHE then they screwed up. If they used FORCE
// without CACHE they screwed up // without CACHE they screwed up
if (args[args.size() - 1] == "CACHE" || if ((args[args.size() - 1] == "CACHE") ||
args.size() > 1 && args[args.size() - 2] == "CACHE" || (args.size() > 1 && args[args.size() - 2] == "CACHE") ||
force && !cache) (force && !cache))
{ {
this->SetError("given invalid arguments for CACHE mode."); this->SetError("given invalid arguments for CACHE mode.");
return false; return false;

12
Source/cmSystemTools.cxx
View File

@ -510,12 +510,12 @@ std::vector<cmStdString> cmSystemTools::ParseArguments(const char* command)
bool win_path = false; bool win_path = false;
if ( command[0] != '/' && command[1] == ':' && command[2] == '\\' || if ((command[0] != '/' && command[1] == ':' && command[2] == '\\') ||
command[0] == '\"' && command[1] != '/' && command[2] == ':' (command[0] == '\"' && command[1] != '/' && command[2] == ':'
&& command[3] == '\\' || && command[3] == '\\') ||
command[0] == '\'' && command[1] != '/' && command[2] == ':' (command[0] == '\'' && command[1] != '/' && command[2] == ':'
&& command[3] == '\\' || && command[3] == '\\') ||
command[0] == '\\' && command[1] == '\\') (command[0] == '\\' && command[1] == '\\'))
{ {
win_path = true; win_path = true;
} }

2
Source/cmUtilitySourceCommand.cxx
View File

@ -56,7 +56,7 @@ bool cmUtilitySourceCommand
{ {
haveCacheValue = (cacheValue && haveCacheValue = (cacheValue &&
(strstr(cacheValue, "(IntDir)") == 0 || (strstr(cacheValue, "(IntDir)") == 0 ||
intDir && strcmp(intDir, "$(IntDir)") == 0) && (intDir && strcmp(intDir, "$(IntDir)") == 0)) &&
(this->Makefile->GetCacheMajorVersion() != 0 && (this->Makefile->GetCacheMajorVersion() != 0 &&
this->Makefile->GetCacheMinorVersion() != 0 )); this->Makefile->GetCacheMinorVersion() != 0 ));
} }