kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: More optimization

Browse Source
This commit is contained in:
Andy Cedilnik 2005-06-13 10:11:44 -04:00
parent 733c1c193b
commit 043ddabc91
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmCommandArgumentParserHelper.cxx
View File

@ -157,27 +157,20 @@ void cmCommandArgumentParserHelper::Print(const char* place, const char* str)
} }
} }
char* cmCommandArgumentParserHelper::CombineUnions(const char* in1, const char* in2) char* cmCommandArgumentParserHelper::CombineUnions(char* in1, char* in2)
{ {
int len = 1; if ( !in1 )
if ( in1 )
{ {
len += strlen(in1); return in2;
} }
if ( in2 ) else if ( !in2 )
{ {
len += strlen(in2); return in1;
} }
int len = strlen(in1) + strlen(in2) + 1;
char* out = new char [ len ]; char* out = new char [ len ];
out[0] = 0; strcpy(out, in1);
if ( in1 ) strcat(out, in2);
{
strcat(out, in1);
}
if ( in2 )
{
strcat(out, in2);
}
return *(m_Variables.insert(out).first); return *(m_Variables.insert(out).first);
} }

2
Source/cmCommandArgumentParserHelper.h
View File

@ -64,7 +64,7 @@ public:
const char* GetCurrentCombine() { return this->CurrentCombine.c_str(); } const char* GetCurrentCombine() { return this->CurrentCombine.c_str(); }
void UpdateCombine(const char* str1, const char* str2); void UpdateCombine(const char* str1, const char* str2);
void Append(const char* str); void Append(const char* str);
char* CombineUnions(const char* in1, const char* in2); char* CombineUnions(char* in1, char* in2);
char* ExpandSpecialVariable(const char* key, const char* var); char* ExpandSpecialVariable(const char* key, const char* var);
char* ExpandVariable(const char* var); char* ExpandVariable(const char* var);