From d9fd2f5402eeaa345691313658e02b51038f570b Mon Sep 17 00:00:00 2001 From: Kitware Robot Date: Mon, 16 May 2016 10:34:04 -0400 Subject: 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. --- Source/cmSiteNameCommand.cxx | 69 ++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 41 deletions(-) (limited to 'Source/cmSiteNameCommand.cxx') diff --git a/Source/cmSiteNameCommand.cxx b/Source/cmSiteNameCommand.cxx index e2970e5053..702af4dab0 100644 --- a/Source/cmSiteNameCommand.cxx +++ b/Source/cmSiteNameCommand.cxx @@ -14,14 +14,13 @@ #include // cmSiteNameCommand -bool cmSiteNameCommand -::InitialPass(std::vector const& args, cmExecutionStatus &) +bool cmSiteNameCommand::InitialPass(std::vector const& args, + cmExecutionStatus&) { - if(args.size() != 1 ) - { + if (args.size() != 1) { this->SetError("called with incorrect number of arguments"); return false; - } + } std::vector paths; paths.push_back("/usr/bsd"); paths.push_back("/usr/sbin"); @@ -30,66 +29,54 @@ bool cmSiteNameCommand paths.push_back("/sbin"); paths.push_back("/usr/local/bin"); - const char* cacheValue - = this->Makefile->GetDefinition(args[0]); - if(cacheValue) - { + const char* cacheValue = this->Makefile->GetDefinition(args[0]); + if (cacheValue) { return true; - } + } - const char *temp = this->Makefile->GetDefinition("HOSTNAME"); + const char* temp = this->Makefile->GetDefinition("HOSTNAME"); std::string hostname_cmd; - if(temp) - { + if (temp) { hostname_cmd = temp; - } - else - { + } else { hostname_cmd = cmSystemTools::FindProgram("hostname", paths); - } + } std::string siteName = "unknown"; #if defined(_WIN32) && !defined(__CYGWIN__) std::string host; - if(cmSystemTools::ReadRegistryValue - ("HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\" - "Control\\ComputerName\\ComputerName;ComputerName", host)) - { + if (cmSystemTools::ReadRegistryValue( + "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\" + "Control\\ComputerName\\ComputerName;ComputerName", + host)) { siteName = host; - } + } #else // try to find the hostname for this computer - if (!cmSystemTools::IsOff(hostname_cmd.c_str())) - { + if (!cmSystemTools::IsOff(hostname_cmd.c_str())) { std::string host; - cmSystemTools::RunSingleCommand(hostname_cmd.c_str(), - &host, 0, 0, 0, cmSystemTools::OUTPUT_NONE); + cmSystemTools::RunSingleCommand(hostname_cmd.c_str(), &host, 0, 0, 0, + cmSystemTools::OUTPUT_NONE); // got the hostname - if (!host.empty()) - { + if (!host.empty()) { // remove any white space from the host name std::string hostRegExp = "[ \t\n\r]*([^\t\n\r ]*)[ \t\n\r]*"; - cmsys::RegularExpression hostReg (hostRegExp.c_str()); - if (hostReg.find(host.c_str())) - { + cmsys::RegularExpression hostReg(hostRegExp.c_str()); + if (hostReg.find(host.c_str())) { // strip whitespace host = hostReg.match(1); - } + } - if(!host.empty()) - { + if (!host.empty()) { siteName = host; - } } } + } #endif - this->Makefile-> - AddCacheDefinition(args[0], - siteName.c_str(), - "Name of the computer/site where compile is being run", - cmState::STRING); + this->Makefile->AddCacheDefinition( + args[0], siteName.c_str(), + "Name of the computer/site where compile is being run", cmState::STRING); return true; } - -- cgit v1.2.1