mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-14 10:19:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmCommandArgumentParserHelper: constify some char* values

Browse Source
This commit is contained in:
Rolf Eike Beer
2017-10-25 17:03:45 +02:00
parent 206354ac4c
commit 98cb9f3ee9
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmCommandArgumentParserHelper.cxx
View File

@@ -44,7 +44,7 @@ void cmCommandArgumentParserHelper::SetLineFile(long line, const char* file)
this->FileName = file;
}
char* cmCommandArgumentParserHelper::AddString(const std::string& str)
const char* cmCommandArgumentParserHelper::AddString(const std::string& str)
{
if (str.empty()) {
return this->EmptyVariable;
@@ -55,8 +55,8 @@ char* cmCommandArgumentParserHelper::AddString(const std::string& str)
return stVal;
}
char* cmCommandArgumentParserHelper::ExpandSpecialVariable(const char* key,
const char* var)
const char* cmCommandArgumentParserHelper::ExpandSpecialVariable(
const char* key, const char* var)
{
if (!key) {
return this->ExpandVariable(var);
@@ -91,7 +91,7 @@ char* cmCommandArgumentParserHelper::ExpandSpecialVariable(const char* key,
return nullptr;
}
char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
const char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
{
if (!var) {
return nullptr;
@@ -125,11 +125,11 @@ char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
return this->AddString(value ? value : "");
}
char* cmCommandArgumentParserHelper::ExpandVariableForAt(const char* var)
const char* cmCommandArgumentParserHelper::ExpandVariableForAt(const char* var)
{
if (this->ReplaceAtSyntax) {
// try to expand the variable
char* ret = this->ExpandVariable(var);
const char* ret = this->ExpandVariable(var);
// if the return was 0 and we want to replace empty strings
// then return an empty string
if (!ret && this->RemoveEmpty) {
@@ -150,7 +150,8 @@ char* cmCommandArgumentParserHelper::ExpandVariableForAt(const char* var)
return this->AddString(ref);
}
char* cmCommandArgumentParserHelper::CombineUnions(char* in1, char* in2)
const char* cmCommandArgumentParserHelper::CombineUnions(const char* in1,
const char* in2)
{
if (!in1) {
return in2;
@@ -176,10 +177,11 @@ void cmCommandArgumentParserHelper::AllocateParserType(
if (len == 0) {
return;
}
pt->str = new char[len + 1];
strncpy(pt->str, str, len);
pt->str[len] = 0;
this->Variables.push_back(pt->str);
char* out = new char[len + 1];
strncpy(out, str, len);
out[len] = 0;
pt->str = out;
this->Variables.push_back(out);
}
bool cmCommandArgumentParserHelper::HandleEscapeSymbol(

12
Source/cmCommandArgumentParserHelper.h
View File

@@ -17,7 +17,7 @@ class cmCommandArgumentParserHelper
public:
struct ParserType
{
char* str;
const char* str;
};
cmCommandArgumentParserHelper();
@@ -35,11 +35,11 @@ public:
void Error(const char* str);
// For yacc
char* CombineUnions(char* in1, char* in2);
const char* CombineUnions(const char* in1, const char* in2);
char* ExpandSpecialVariable(const char* key, const char* var);
char* ExpandVariable(const char* var);
char* ExpandVariableForAt(const char* var);
const char* ExpandSpecialVariable(const char* key, const char* var);
const char* ExpandVariable(const char* var);
const char* ExpandVariableForAt(const char* var);
void SetResult(const char* value);
void SetMakefile(const cmMakefile* mf);
@@ -69,7 +69,7 @@ private:
void Print(const char* place, const char* str);
void SafePrintMissing(const char* str, int line, int cnt);
char* AddString(const std::string& str);
const char* AddString(const std::string& str);
void CleanupParser();
void SetError(std::string const& msg);