mirror of
https://gitlab.com/sortix/sortix.git
synced 2023-02-13 20:55:38 -05:00
Added String::Combine.
It was previously commented out because it was broken.
This commit is contained in:
parent
bd489eb73a
commit
795b1ef4fd
1 changed files with 5 additions and 4 deletions
|
@ -333,7 +333,7 @@ namespace Maxsi
|
|||
}
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
#if 1
|
||||
char* Combine(size_t NumParameters, ...)
|
||||
{
|
||||
va_list param_pt;
|
||||
|
@ -348,11 +348,12 @@ namespace Maxsi
|
|||
{
|
||||
TMP = va_arg(param_pt, const char*);
|
||||
|
||||
if ( TMP != NULL ) { ResultLength += strlen(TMP); }
|
||||
if ( TMP != NULL ) { ResultLength += Length(TMP); }
|
||||
}
|
||||
|
||||
// Allocate a string with the desired length.
|
||||
char* Result = new char[ResultLength+1];
|
||||
if ( !Result ) { return NULL; }
|
||||
|
||||
Result[0] = 0;
|
||||
|
||||
|
@ -367,8 +368,8 @@ namespace Maxsi
|
|||
|
||||
if ( TMP )
|
||||
{
|
||||
size_t TMPLength = strlen(TMP);
|
||||
strcpy(Result + ResultOffset, TMP);
|
||||
size_t TMPLength = Length(TMP);
|
||||
Copy(Result + ResultOffset, TMP);
|
||||
ResultOffset += TMPLength;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue