diff --git a/kernel/include/sortix/kernel/string.h b/kernel/include/sortix/kernel/string.h index 4a29597a..5e1ed7a0 100644 --- a/kernel/include/sortix/kernel/string.h +++ b/kernel/include/sortix/kernel/string.h @@ -31,7 +31,6 @@ namespace Sortix { namespace String { char* Clone(const char* Source); -char* Combine(size_t NumParameters, ...); char* Substring(const char* src, size_t offset, size_t length); bool StartsWith(const char* Haystack, const char* Needle); diff --git a/kernel/string.cpp b/kernel/string.cpp index 245f936b..cd31c4e5 100644 --- a/kernel/string.cpp +++ b/kernel/string.cpp @@ -52,48 +52,5 @@ char* Substring(const char* src, size_t offset, size_t length) return dest; } -char* Combine(size_t NumParameters, ...) -{ - va_list param_pt; - - va_start(param_pt, NumParameters); - - // First calculate the string length. - size_t ResultLength = 0; - const char* TMP = 0; - - for ( size_t I = 0; I < NumParameters; I++ ) - { - TMP = va_arg(param_pt, const char*); - - if ( TMP != NULL ) { ResultLength += strlen(TMP); } - } - - // Allocate a string with the desired length. - char* Result = new char[ResultLength+1]; - if ( !Result ) { return NULL; } - - Result[0] = 0; - - va_end(param_pt); - va_start(param_pt, NumParameters); - - size_t ResultOffset = 0; - - for ( size_t I = 0; I < NumParameters; I++ ) - { - TMP = va_arg(param_pt, const char*); - - if ( TMP ) - { - size_t TMPLength = strlen(TMP); - strcpy(Result + ResultOffset, TMP); - ResultOffset += TMPLength; - } - } - - return Result; -} - } // namespace String } // namespace Sortix