diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-03 14:45:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-03 14:45:40 (GMT) |
| commit | 811831a958c91404193cc0a35d2d90f8351eb51c (patch) | |
| tree | 589c888e14f727eb48adb6f0fa7f3f83cace3f65 /Source/CPack/IFW/cmCPackIFWRepository.cxx | |
| parent | 8b289db739c8d0a288e532c560b6dbcf4bd67c30 (diff) | |
| parent | 7f6b8d3399dd841b0d29bf74d2b31021738c4ef8 (diff) | |
| download | CMake-811831a958c91404193cc0a35d2d90f8351eb51c.zip CMake-811831a958c91404193cc0a35d2d90f8351eb51c.tar.gz CMake-811831a958c91404193cc0a35d2d90f8351eb51c.tar.bz2 | |
Merge topic 'simplify-boolean-expressions'
7f6b8d33 Simplify boolean expressions
Diffstat (limited to 'Source/CPack/IFW/cmCPackIFWRepository.cxx')
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWRepository.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWRepository.cxx b/Source/CPack/IFW/cmCPackIFWRepository.cxx index b149f81..1838005 100644 --- a/Source/CPack/IFW/cmCPackIFWRepository.cxx +++ b/Source/CPack/IFW/cmCPackIFWRepository.cxx @@ -45,16 +45,16 @@ bool cmCPackIFWRepository::IsValid() const switch (Update) { case None: - valid = Url.empty() ? false : true; + valid = !Url.empty(); break; case Add: - valid = Url.empty() ? false : true; + valid = !Url.empty(); break; case Remove: - valid = Url.empty() ? false : true; + valid = !Url.empty(); break; case Replace: - valid = (OldUrl.empty() || NewUrl.empty()) ? false : true; + valid = !OldUrl.empty() && !NewUrl.empty(); break; } @@ -244,11 +244,7 @@ bool cmCPackIFWRepository::PatchUpdatesXml() fout.Close(); - if (!cmSystemTools::RenameFile(updatesPatchXml.data(), updatesXml.data())) { - return false; - } - - return true; + return cmSystemTools::RenameFile(updatesPatchXml.data(), updatesXml.data()); } void cmCPackIFWRepository::WriteRepositoryConfig(cmXMLWriter& xout) |