Revise C++ coding style using clang-format

Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.
This commit is contained in:
Kitware Robot
2016-05-16 10:34:04 -04:00
committed by Brad King
parent 82df6deaaf
commit d9fd2f5402
1450 changed files with 62404 additions and 83728 deletions

View File

@@ -18,14 +18,13 @@
#include <sys/stat.h>
// cmLibraryCommand
bool cmWriteFileCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
bool cmWriteFileCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
{
if(args.size() < 2 )
{
if (args.size() < 2) {
this->SetError("called with incorrect number of arguments");
return false;
}
}
std::string message;
std::vector<std::string>::const_iterator i = args.begin();
@@ -33,26 +32,21 @@ bool cmWriteFileCommand
bool overwrite = true;
i++;
for(;i != args.end(); ++i)
{
if ( *i == "APPEND" )
{
for (; i != args.end(); ++i) {
if (*i == "APPEND") {
overwrite = false;
}
else
{
} else {
message += *i;
}
}
}
if ( !this->Makefile->CanIWriteThisFile(fileName.c_str()) )
{
std::string e = "attempted to write a file: " + fileName
+ " into a source directory.";
if (!this->Makefile->CanIWriteThisFile(fileName.c_str())) {
std::string e =
"attempted to write a file: " + fileName + " into a source directory.";
this->SetError(e);
cmSystemTools::SetFatalErrorOccured();
return false;
}
}
std::string dir = cmSystemTools::GetFilenamePath(fileName);
cmSystemTools::MakeDirectory(dir.c_str());
@@ -60,35 +54,31 @@ bool cmWriteFileCommand
mode_t mode = 0;
// Set permissions to writable
if ( cmSystemTools::GetPermissions(fileName.c_str(), mode) )
{
if (cmSystemTools::GetPermissions(fileName.c_str(), mode)) {
cmSystemTools::SetPermissions(fileName.c_str(),
#if defined( _MSC_VER ) || defined( __MINGW32__ )
mode | S_IWRITE
#if defined(_MSC_VER) || defined(__MINGW32__)
mode | S_IWRITE
#else
mode | S_IWUSR | S_IWGRP
mode | S_IWUSR | S_IWGRP
#endif
);
}
);
}
// If GetPermissions fails, pretend like it is ok. File open will fail if
// the file is not writable
cmsys::ofstream file(fileName.c_str(),
overwrite?std::ios::out : std::ios::app);
if ( !file )
{
overwrite ? std::ios::out : std::ios::app);
if (!file) {
std::string error = "Internal CMake error when trying to open file: ";
error += fileName.c_str();
error += " for writing.";
this->SetError(error);
return false;
}
}
file << message << std::endl;
file.close();
if(mode)
{
if (mode) {
cmSystemTools::SetPermissions(fileName.c_str(), mode);
}
}
return true;
}