diff options
Diffstat (limited to 'Source/cmUnsetCommand.cxx')
| -rw-r--r-- | Source/cmUnsetCommand.cxx | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/Source/cmUnsetCommand.cxx b/Source/cmUnsetCommand.cxx index 053cdfc7d8..c04c44ad8d 100644 --- a/Source/cmUnsetCommand.cxx +++ b/Source/cmUnsetCommand.cxx @@ -13,53 +13,46 @@ // cmUnsetCommand bool cmUnsetCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus &) + cmExecutionStatus&) { - if(args.size() < 1 || args.size() > 2) - { + if (args.size() < 1 || args.size() > 2) { this->SetError("called with incorrect number of arguments"); return false; - } + } const char* variable = args[0].c_str(); // unset(ENV{VAR}) - if (cmHasLiteralPrefix(variable, "ENV{") && strlen(variable) > 5) - { + if (cmHasLiteralPrefix(variable, "ENV{") && strlen(variable) > 5) { // what is the variable name - char *envVarName = new char [strlen(variable)]; - strncpy(envVarName,variable+4,strlen(variable)-5); - envVarName[strlen(variable)-5] = '\0'; + char* envVarName = new char[strlen(variable)]; + strncpy(envVarName, variable + 4, strlen(variable) - 5); + envVarName[strlen(variable) - 5] = '\0'; #ifdef CMAKE_BUILD_WITH_CMAKE cmSystemTools::UnsetEnv(envVarName); #endif delete[] envVarName; return true; - } + } // unset(VAR) - else if (args.size() == 1) - { + else if (args.size() == 1) { this->Makefile->RemoveDefinition(variable); return true; - } + } // unset(VAR CACHE) - else if ((args.size() == 2) && (args[1] == "CACHE")) - { + else if ((args.size() == 2) && (args[1] == "CACHE")) { this->Makefile->RemoveCacheDefinition(variable); return true; - } + } // unset(VAR PARENT_SCOPE) - else if ((args.size() == 2) && (args[1] == "PARENT_SCOPE")) - { + else if ((args.size() == 2) && (args[1] == "PARENT_SCOPE")) { this->Makefile->RaiseScope(variable, 0); return true; - } + } // ERROR: second argument isn't CACHE or PARENT_SCOPE - else - { + else { this->SetError("called with an invalid second argument"); return false; - } + } } - |