diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 10:34:04 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:05:19 -0400 |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmLoadCommandCommand.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | cmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz |
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.
Diffstat (limited to 'Source/cmLoadCommandCommand.cxx')
-rw-r--r-- | Source/cmLoadCommandCommand.cxx | 195 |
1 files changed, 88 insertions, 107 deletions
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 14b70e413b..081c22ea39 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -20,19 +20,19 @@ #include <stdlib.h> #ifdef __QNX__ -# include <malloc.h> /* for malloc/free on QNX */ +#include <malloc.h> /* for malloc/free on QNX */ #endif #include <signal.h> extern "C" void TrapsForSignalsCFunction(int sig); - // a class for loadabple commands class cmLoadedCommand : public cmCommand { public: - cmLoadedCommand() { - memset(&this->info,0,sizeof(this->info)); + cmLoadedCommand() + { + memset(&this->info, 0, sizeof(this->info)); this->info.CAPI = &cmStaticCAPI; } @@ -43,19 +43,19 @@ public: * This is a virtual constructor for the command. */ virtual cmCommand* Clone() - { - cmLoadedCommand *newC = new cmLoadedCommand; - // we must copy when we clone - memcpy(&newC->info,&this->info,sizeof(info)); - return newC; - } + { + cmLoadedCommand* newC = new cmLoadedCommand; + // we must copy when we clone + memcpy(&newC->info, &this->info, sizeof(info)); + return newC; + } /** * This is called when the command is first encountered in * the CMakeLists.txt file. */ virtual bool InitialPass(std::vector<std::string> const& args, - cmExecutionStatus &); + cmExecutionStatus&); /** * This is called at the end after all the information @@ -65,7 +65,9 @@ public: */ virtual void FinalPass(); virtual bool HasFinalPass() const - { return this->info.FinalPass? true:false; } + { + return this->info.FinalPass ? true : false; + } /** * The name of the command as specified in CMakeList.txt. @@ -74,35 +76,31 @@ public: static const char* LastName; static void TrapsForSignals(int sig) - { - fprintf(stderr, "CMake loaded command %s crashed with signal: %d.\n", - cmLoadedCommand::LastName, sig); - } + { + fprintf(stderr, "CMake loaded command %s crashed with signal: %d.\n", + cmLoadedCommand::LastName, sig); + } static void InstallSignalHandlers(const char* name, int remove = 0) - { - cmLoadedCommand::LastName = name; - if(!name) - { - cmLoadedCommand::LastName = "????"; - } - - if(!remove) - { - signal(SIGSEGV, TrapsForSignalsCFunction); + { + cmLoadedCommand::LastName = name; + if (!name) { + cmLoadedCommand::LastName = "????"; + } + + if (!remove) { + signal(SIGSEGV, TrapsForSignalsCFunction); #ifdef SIGBUS - signal(SIGBUS, TrapsForSignalsCFunction); + signal(SIGBUS, TrapsForSignalsCFunction); #endif - signal(SIGILL, TrapsForSignalsCFunction); - } - else - { - signal(SIGSEGV, 0); + signal(SIGILL, TrapsForSignalsCFunction); + } else { + signal(SIGSEGV, 0); #ifdef SIGBUS - signal(SIGBUS, 0); + signal(SIGBUS, 0); #endif - signal(SIGILL, 0); - } + signal(SIGILL, 0); } + } cmTypeMacro(cmLoadedCommand, cmCommand); @@ -114,89 +112,80 @@ extern "C" void TrapsForSignalsCFunction(int sig) cmLoadedCommand::TrapsForSignals(sig); } - const char* cmLoadedCommand::LastName = 0; bool cmLoadedCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus &) + cmExecutionStatus&) { - if (!info.InitialPass) - { + if (!info.InitialPass) { return true; - } + } // clear the error string - if (this->info.Error) - { + if (this->info.Error) { free(this->info.Error); - } + } // create argc and argv and then invoke the command - int argc = static_cast<int> (args.size()); - char **argv = 0; - if (argc) - { - argv = (char **)malloc(argc*sizeof(char *)); - } + int argc = static_cast<int>(args.size()); + char** argv = 0; + if (argc) { + argv = (char**)malloc(argc * sizeof(char*)); + } int i; - for (i = 0; i < argc; ++i) - { + for (i = 0; i < argc; ++i) { argv[i] = strdup(args[i].c_str()); - } + } cmLoadedCommand::InstallSignalHandlers(info.Name); - int result = info.InitialPass((void *)&info, - (void *)this->Makefile,argc,argv); + int result = + info.InitialPass((void*)&info, (void*)this->Makefile, argc, argv); cmLoadedCommand::InstallSignalHandlers(info.Name, 1); - cmFreeArguments(argc,argv); + cmFreeArguments(argc, argv); - if (result) - { + if (result) { return true; - } + } /* Initial Pass must have failed so set the error string */ - if (this->info.Error) - { + if (this->info.Error) { this->SetError(this->info.Error); - } + } return false; } void cmLoadedCommand::FinalPass() { - if (this->info.FinalPass) - { + if (this->info.FinalPass) { cmLoadedCommand::InstallSignalHandlers(info.Name); - this->info.FinalPass((void *)&this->info,(void *)this->Makefile); + this->info.FinalPass((void*)&this->info, (void*)this->Makefile); cmLoadedCommand::InstallSignalHandlers(info.Name, 1); - } + } } cmLoadedCommand::~cmLoadedCommand() { - if (this->info.Destructor) - { + if (this->info.Destructor) { cmLoadedCommand::InstallSignalHandlers(info.Name); - this->info.Destructor((void *)&this->info); + this->info.Destructor((void*)&this->info); cmLoadedCommand::InstallSignalHandlers(info.Name, 1); - } - if (this->info.Error) - { + } + if (this->info.Error) { free(this->info.Error); - } + } } // cmLoadCommandCommand -bool cmLoadCommandCommand -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& args, + cmExecutionStatus&) { - if(this->Disallowed(cmPolicies::CMP0031, - "The load_command command should not be called; see CMP0031.")) - { return true; } - if(args.size() < 1 ) - { + if (this->Disallowed( + cmPolicies::CMP0031, + "The load_command command should not be called; see CMP0031.")) { return true; - } + } + if (args.size() < 1) { + return true; + } // Construct a variable to report what file was loaded, if any. // Start by removing the definition in case of failure. @@ -213,72 +202,64 @@ bool cmLoadCommandCommand // search for the file std::vector<std::string> path; - for (unsigned int j = 1; j < args.size(); j++) - { + for (unsigned int j = 1; j < args.size(); j++) { // expand variables std::string exp = args[j]; cmSystemTools::ExpandRegistryValues(exp); // Glob the entry in case of wildcards. cmSystemTools::GlobDirs(exp, path); - } + } // Try to find the program. std::string fullPath = cmSystemTools::FindFile(moduleName.c_str(), path); - if (fullPath == "") - { + if (fullPath == "") { std::ostringstream e; - e << "Attempt to load command failed from file \"" - << moduleName << "\""; + e << "Attempt to load command failed from file \"" << moduleName << "\""; this->SetError(e.str()); return false; - } + } // try loading the shared library / dll - cmsys::DynamicLoader::LibraryHandle lib - = cmDynamicLoader::OpenLibrary(fullPath.c_str()); - if(!lib) - { + cmsys::DynamicLoader::LibraryHandle lib = + cmDynamicLoader::OpenLibrary(fullPath.c_str()); + if (!lib) { std::string err = "Attempt to load the library "; err += fullPath + " failed."; const char* error = cmsys::DynamicLoader::LastError(); - if ( error ) - { + if (error) { err += " Additional error info is:\n"; err += error; - } + } this->SetError(err); return false; - } + } // Report what file was loaded for this command. this->Makefile->AddDefinition(reportVar, fullPath.c_str()); // find the init function std::string initFuncName = args[0] + "Init"; - CM_INIT_FUNCTION initFunction - = (CM_INIT_FUNCTION) - cmsys::DynamicLoader::GetSymbolAddress(lib, initFuncName.c_str()); - if ( !initFunction ) - { + CM_INIT_FUNCTION initFunction = + (CM_INIT_FUNCTION)cmsys::DynamicLoader::GetSymbolAddress( + lib, initFuncName.c_str()); + if (!initFunction) { initFuncName = "_"; initFuncName += args[0]; initFuncName += "Init"; initFunction = (CM_INIT_FUNCTION)( cmsys::DynamicLoader::GetSymbolAddress(lib, initFuncName.c_str())); - } + } // if the symbol is found call it to set the name on the // function blocker - if(initFunction) - { + if (initFunction) { // create a function blocker and set it up - cmLoadedCommand *f = new cmLoadedCommand(); + cmLoadedCommand* f = new cmLoadedCommand(); (*initFunction)(&f->info); this->Makefile->GetState()->AddCommand(f); return true; - } + } this->SetError("Attempt to load command failed. " "No init function found."); return false; } - |