From f56bb35301836e56582a575a75864392a0177875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20P=2E=20Tjern=C3=B8?= Date: Mon, 2 Dec 2013 19:31:46 -0800 Subject: Fix line endings. WHAMMY. --- mp/src/tier1/splitstring.cpp | 182 +++++++++++++++++++++---------------------- 1 file changed, 91 insertions(+), 91 deletions(-) (limited to 'mp/src/tier1/splitstring.cpp') diff --git a/mp/src/tier1/splitstring.cpp b/mp/src/tier1/splitstring.cpp index d2694328..461aa61d 100644 --- a/mp/src/tier1/splitstring.cpp +++ b/mp/src/tier1/splitstring.cpp @@ -1,91 +1,91 @@ -//========= Copyright Valve Corporation, All rights reserved. ============// -// -// -// -//================================================================================================== - -#include "strtools.h" -#include "utlvector.h" - -CSplitString::CSplitString(const char *pString, const char **pSeparators, int nSeparators) -{ - Construct(pString, pSeparators, nSeparators); -}; - -CSplitString::CSplitString( const char *pString, const char *pSeparator) -{ - Construct( pString, &pSeparator, 1 ); -} - -CSplitString::~CSplitString() -{ - if(m_szBuffer) - delete [] m_szBuffer; -} - -void CSplitString::Construct( const char *pString, const char **pSeparators, int nSeparators ) -{ - ////////////////////////////////////////////////////////////////////////// - // make a duplicate of the original string. We'll use pieces of this duplicate to tokenize the string - // and create NULL-terminated tokens of the original string - // - int nOriginalStringLength = V_strlen(pString); - m_szBuffer = new char[nOriginalStringLength + 1]; - memcpy(m_szBuffer, pString, nOriginalStringLength + 1); - - this->Purge(); - const char *pCurPos = pString; - while ( 1 ) - { - int iFirstSeparator = -1; - const char *pFirstSeparator = 0; - for ( int i=0; i < nSeparators; i++ ) - { - const char *pTest = V_stristr( pCurPos, pSeparators[i] ); - if ( pTest && (!pFirstSeparator || pTest < pFirstSeparator) ) - { - iFirstSeparator = i; - pFirstSeparator = pTest; - } - } - - if ( pFirstSeparator ) - { - // Split on this separator and continue on. - int separatorLen = strlen( pSeparators[iFirstSeparator] ); - if ( pFirstSeparator > pCurPos ) - { - ////////////////////////////////////////////////////////////////////////// - /// Cut the token out of the duplicate string - char *pTokenInDuplicate = m_szBuffer + (pCurPos - pString); - int nTokenLength = pFirstSeparator-pCurPos; - Assert(nTokenLength > 0 && !memcmp(pTokenInDuplicate,pCurPos,nTokenLength)); - pTokenInDuplicate[nTokenLength] = '\0'; - - this->AddToTail( pTokenInDuplicate /*AllocString( pCurPos, pFirstSeparator-pCurPos )*/ ); - } - - pCurPos = pFirstSeparator + separatorLen; - } - else - { - // Copy the rest of the string - if ( int nTokenLength = strlen( pCurPos ) ) - { - ////////////////////////////////////////////////////////////////////////// - // There's no need to cut this token, because there's no separator after it. - // just add its copy in the buffer to the tail - char *pTokenInDuplicate = m_szBuffer + (pCurPos - pString); - Assert(!memcmp(pTokenInDuplicate, pCurPos, nTokenLength)); - - this->AddToTail( pTokenInDuplicate/*AllocString( pCurPos, -1 )*/ ); - } - return; - } - } -} - -void CSplitString::PurgeAndDeleteElements() -{ - Purge(); -} +//========= Copyright Valve Corporation, All rights reserved. ============// +// +// +// +//================================================================================================== + +#include "strtools.h" +#include "utlvector.h" + +CSplitString::CSplitString(const char *pString, const char **pSeparators, int nSeparators) +{ + Construct(pString, pSeparators, nSeparators); +}; + +CSplitString::CSplitString( const char *pString, const char *pSeparator) +{ + Construct( pString, &pSeparator, 1 ); +} + +CSplitString::~CSplitString() +{ + if(m_szBuffer) + delete [] m_szBuffer; +} + +void CSplitString::Construct( const char *pString, const char **pSeparators, int nSeparators ) +{ + ////////////////////////////////////////////////////////////////////////// + // make a duplicate of the original string. We'll use pieces of this duplicate to tokenize the string + // and create NULL-terminated tokens of the original string + // + int nOriginalStringLength = V_strlen(pString); + m_szBuffer = new char[nOriginalStringLength + 1]; + memcpy(m_szBuffer, pString, nOriginalStringLength + 1); + + this->Purge(); + const char *pCurPos = pString; + while ( 1 ) + { + int iFirstSeparator = -1; + const char *pFirstSeparator = 0; + for ( int i=0; i < nSeparators; i++ ) + { + const char *pTest = V_stristr( pCurPos, pSeparators[i] ); + if ( pTest && (!pFirstSeparator || pTest < pFirstSeparator) ) + { + iFirstSeparator = i; + pFirstSeparator = pTest; + } + } + + if ( pFirstSeparator ) + { + // Split on this separator and continue on. + int separatorLen = strlen( pSeparators[iFirstSeparator] ); + if ( pFirstSeparator > pCurPos ) + { + ////////////////////////////////////////////////////////////////////////// + /// Cut the token out of the duplicate string + char *pTokenInDuplicate = m_szBuffer + (pCurPos - pString); + int nTokenLength = pFirstSeparator-pCurPos; + Assert(nTokenLength > 0 && !memcmp(pTokenInDuplicate,pCurPos,nTokenLength)); + pTokenInDuplicate[nTokenLength] = '\0'; + + this->AddToTail( pTokenInDuplicate /*AllocString( pCurPos, pFirstSeparator-pCurPos )*/ ); + } + + pCurPos = pFirstSeparator + separatorLen; + } + else + { + // Copy the rest of the string + if ( int nTokenLength = strlen( pCurPos ) ) + { + ////////////////////////////////////////////////////////////////////////// + // There's no need to cut this token, because there's no separator after it. + // just add its copy in the buffer to the tail + char *pTokenInDuplicate = m_szBuffer + (pCurPos - pString); + Assert(!memcmp(pTokenInDuplicate, pCurPos, nTokenLength)); + + this->AddToTail( pTokenInDuplicate/*AllocString( pCurPos, -1 )*/ ); + } + return; + } + } +} + +void CSplitString::PurgeAndDeleteElements() +{ + Purge(); +} -- cgit v1.2.3